diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /data/maps | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'data/maps')
341 files changed, 8094 insertions, 8328 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index ee4b69f24..e40ddad1e 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -11,28 +11,28 @@ AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 goto_eq AbandonedShip_CaptainsOffice_EventScript_238810 checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A - msgbox AbandonedShip_CaptainsOffice_Text_238824, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238824, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_238810:: @ 8238810 - msgbox AbandonedShip_CaptainsOffice_Text_23889D, 4 + msgbox AbandonedShip_CaptainsOffice_Text_23889D, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_EventScript_23881A:: @ 823881A - msgbox AbandonedShip_CaptainsOffice_Text_238918, 4 + msgbox AbandonedShip_CaptainsOffice_Text_238918, MSGBOX_DEFAULT release end AbandonedShip_CaptainsOffice_Text_238824: @ 8238824 - .string "I’m investigating this ship on behalf\n" + .string "I'm investigating this ship on behalf\n" .string "of CAPT. STERN.\p" .string "He also asked me to find a SCANNER,\n" - .string "but I haven’t had any success…$" + .string "but I haven't had any success…$" AbandonedShip_CaptainsOffice_Text_23889D: @ 823889D - .string "Oh! That’s a SCANNER!\p" + .string "Oh! That's a SCANNER!\p" .string "Listen, can I get you to deliver that\n" .string "to CAPT. STERN?\p" .string "I want to investigate this ship a\n" diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 39c7861a1..15fda4194 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -2,26 +2,25 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4 .byte 0 AbandonedShip_Corridors_1F_EventScript_2379A5:: @ 82379A5 - msgbox AbandonedShip_Corridors_1F_Text_237A60, 2 + msgbox AbandonedShip_Corridors_1F_Text_237A60, MSGBOX_NPC end AbandonedShip_Corridors_1F_EventScript_2379AE:: @ 82379AE - trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 - msgbox AbandonedShip_Corridors_1F_Text_237A1B, 6 + trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_2379C5, AbandonedShip_Corridors_1F_Text_237A01 + msgbox AbandonedShip_Corridors_1F_Text_237A1B, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_1F_Text_2379C5: @ 82379C5 - .string "What’s so funny about having my inner\n" + .string "What's so funny about having my inner\n" .string "tube aboard the ship?$" AbandonedShip_Corridors_1F_Text_237A01: @ 8237A01 .string "Whoa, you overwhelmed me!$" AbandonedShip_Corridors_1F_Text_237A1B: @ 8237A1B - .string "It’s not easy throwing POKé BALLS\n" + .string "It's not easy throwing POKé BALLS\n" .string "while hanging on to an inner tube!$" AbandonedShip_Corridors_1F_Text_237A60: @ 8237A60 - .string "Isn’t it fun here?\n" + .string "Isn't it fun here?\n" .string "I get excited just being here!$" - diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index f19dfe322..4715e5566 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -23,7 +23,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5 return AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF - msgbox AbandonedShip_Corridors_B1F_Text_237F03, 2 + msgbox AbandonedShip_Corridors_B1F_Text_237F03, MSGBOX_NPC end AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 @@ -33,7 +33,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_0x0EF @@ -43,18 +43,18 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 end AbandonedShip_Corridors_B1F_EventScript_237DFF:: @ 8237DFF - msgbox AbandonedShip_Corridors_B1F_Text_237F15, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237F15, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E09:: @ 8237E09 - msgbox AbandonedShip_Corridors_B1F_Text_237FA5, 4 + msgbox AbandonedShip_Corridors_B1F_Text_237FA5, MSGBOX_DEFAULT releaseall end AbandonedShip_Corridors_B1F_EventScript_237E13:: @ 8237E13 - trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 - msgbox AbandonedShip_Corridors_B1F_Text_237E92, 6 + trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_237E2A, AbandonedShip_Corridors_B1F_Text_237E80 + msgbox AbandonedShip_Corridors_B1F_Text_237E92, MSGBOX_AUTOCLOSE end AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A @@ -63,17 +63,17 @@ AbandonedShip_Corridors_B1F_Text_237E2A: @ 8237E2A .string "How about a quick battle?$" AbandonedShip_Corridors_B1F_Text_237E80: @ 8237E80 - .string "Whoops, I’m sunk!$" + .string "Whoops, I'm sunk!$" AbandonedShip_Corridors_B1F_Text_237E92: @ 8237E92 - .string "The ship’s bottom has sunk into the\n" + .string "The ship's bottom has sunk into the\n" .string "depths.\p" .string "If a POKéMON knew how to go underwater,\n" .string "we might make some progress…$" AbandonedShip_Corridors_B1F_Text_237F03: @ 8237F03 .string "Yay!\n" - .string "It’s a ship!$" + .string "It's a ship!$" AbandonedShip_Corridors_B1F_Text_237F15: @ 8237F15 .string "The door is locked.\p" diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 2cd278f91..e3c3ced5c 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_0x0F0 @@ -81,7 +81,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_0x0F1 @@ -97,7 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_0x0F2 @@ -113,7 +113,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_0x0F3 @@ -123,27 +123,27 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE end AbandonedShip_HiddenFloorCorridors_EventScript_238AF5:: @ 8238AF5 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B27, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238AFF:: @ 8238AFF - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B5B, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B09:: @ 8238B09 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238B8F, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B13:: @ 8238B13 - msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_238BC3, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorCorridors_EventScript_238B1D:: @ 8238B1D - msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, 4 + msgbox AbandonedShip_HiddenFloorCorridors_Text_237FA5, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 628c9cece..c89163af2 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -138,11 +138,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 lockall - msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, 4 + msgbox AbandonedShip_HiddenFloorRooms_Text_238DFE, MSGBOX_DEFAULT releaseall end AbandonedShip_HiddenFloorRooms_Text_238DFE: @ 8238DFE - .string "It’s bright and shiny!\n" - .string "But it’s just trash…$" + .string "It's bright and shiny!\n" + .string "But it's just trash…$" diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index 2ffe3afc7..5c934f263 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,59 +2,53 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6 .byte 0 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7 - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0 - msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23820F, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_2380D7:: @ 82380D7 - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT + register_matchcall TRAINER_KIRA_AND_DAN_1 release end AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 - msgbox AbandonedShip_Rooms2_1F_Text_238491, 6 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2383FF, AbandonedShip_Rooms2_1F_Text_238473, AbandonedShip_Rooms2_1F_Text_238509 + msgbox AbandonedShip_Rooms2_1F_Text_238491, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B - trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B + trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms2_1F_EventScript_238154 - msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4 + msgbox AbandonedShip_Rooms2_1F_Text_23830A, MSGBOX_DEFAULT release end AbandonedShip_Rooms2_1F_EventScript_23813B:: @ 823813B - msgbox AbandonedShip_Rooms2_1F_Text_2383BB, 4 - setvar VAR_0x8004, 642 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 642 - callstd 8 + msgbox AbandonedShip_Rooms2_1F_Text_2383BB, MSGBOX_DEFAULT + register_matchcall TRAINER_KIRA_AND_DAN_1 release end AbandonedShip_Rooms2_1F_EventScript_238154:: @ 8238154 - trainerbattle 7, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 - msgbox AbandonedShip_Rooms2_1F_Text_23860B, 6 + trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_238556, AbandonedShip_Rooms2_1F_Text_2385F2, AbandonedShip_Rooms2_1F_Text_238668 + msgbox AbandonedShip_Rooms2_1F_Text_23860B, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_23816F:: @ 823816F - trainerbattle 0, TRAINER_JANI, 0, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 - msgbox AbandonedShip_Rooms2_1F_Text_238708, 6 + trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_2386B4, AbandonedShip_Rooms2_1F_Text_2386E8 + msgbox AbandonedShip_Rooms2_1F_Text_238708, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_EventScript_238186:: @ 8238186 - trainerbattle 0, TRAINER_GARRISON, 0, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 - msgbox AbandonedShip_Rooms2_1F_Text_2387A9, 6 + trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_23873F, AbandonedShip_Rooms2_1F_Text_238779 + msgbox AbandonedShip_Rooms2_1F_Text_2387A9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D @@ -62,16 +56,16 @@ AbandonedShip_Rooms2_1F_Text_23819D: @ 823819D .string "we discovered a TRAINER!$" AbandonedShip_Rooms2_1F_Text_2381DA: @ 82381DA - .string "DAN: We couldn’t win even though\n" + .string "DAN: We couldn't win even though\n" .string "we worked together…$" AbandonedShip_Rooms2_1F_Text_23820F: @ 823820F - .string "DAN: We can’t find any treasures…\n" + .string "DAN: We can't find any treasures…\n" .string "I wonder if someone got them already?$" AbandonedShip_Rooms2_1F_Text_238257: @ 8238257 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "DAN: You don't even have two POKéMON.\n" + .string "You can't expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_2382A4: @ 82382A4 .string "KIRA: Oh?\n" @@ -83,39 +77,39 @@ AbandonedShip_Rooms2_1F_Text_2382F4: @ 82382F4 AbandonedShip_Rooms2_1F_Text_23830A: @ 823830A .string "KIRA: Where could the treasures be?\p" - .string "I’ve already decided what I’m buying\n" + .string "I've already decided what I'm buying\n" .string "when we find the treasures!$" AbandonedShip_Rooms2_1F_Text_23836F: @ 823836F - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" + .string "KIRA: Oh, you don't have two POKéMON?\n" + .string "We'll have to battle some other time!$" AbandonedShip_Rooms2_1F_Text_2383BB: @ 82383BB .string "KIRA: Oh, you make me so angry!\n" - .string "I’m going to register you for that!$" + .string "I'm going to register you for that!$" AbandonedShip_Rooms2_1F_Text_2383FF: @ 82383FF - .string "DAN: We’ve been searching for\n" + .string "DAN: We've been searching for\n" .string "treasures all this time.\p" .string "Our POKéMON have grown stronger, too.\n" .string "Let us show you, okay?$" AbandonedShip_Rooms2_1F_Text_238473: @ 8238473 - .string "DAN: You’re strong, as usual!$" + .string "DAN: You're strong, as usual!$" AbandonedShip_Rooms2_1F_Text_238491: @ 8238491 - .string "DAN: We can’t find any treasures,\n" + .string "DAN: We can't find any treasures,\n" .string "we lose at POKéMON…\p" .string "I want to go home… But if I say that,\n" .string "she gets all angry with me…$" AbandonedShip_Rooms2_1F_Text_238509: @ 8238509 - .string "DAN: You don’t even have two POKéMON.\n" - .string "You can’t expect to beat us like that.$" + .string "DAN: You don't even have two POKéMON.\n" + .string "You can't expect to beat us like that.$" AbandonedShip_Rooms2_1F_Text_238556: @ 8238556 .string "KIRA: Oh? We meet again!\p" - .string "Just like us, you still haven’t given up\n" + .string "Just like us, you still haven't given up\n" .string "searching for treasures, have you?\p" .string "Want to make it so the loser has\n" .string "to give up searching?$" @@ -124,21 +118,21 @@ AbandonedShip_Rooms2_1F_Text_2385F2: @ 82385F2 .string "KIRA: Oh, we lost again…$" AbandonedShip_Rooms2_1F_Text_23860B: @ 823860B - .string "KIRA: We’re not leaving until we raise\n" + .string "KIRA: We're not leaving until we raise\n" .string "our POKéMON some more and we find\l" .string "the treasures here!$" AbandonedShip_Rooms2_1F_Text_238668: @ 8238668 - .string "KIRA: Oh, you don’t have two POKéMON?\n" - .string "We’ll have to battle some other time!$" + .string "KIRA: Oh, you don't have two POKéMON?\n" + .string "We'll have to battle some other time!$" AbandonedShip_Rooms2_1F_Text_2386B4: @ 82386B4 - .string "I’m not good at swimming,\n" + .string "I'm not good at swimming,\n" .string "but I am good at battles!$" AbandonedShip_Rooms2_1F_Text_2386E8: @ 82386E8 .string "Oops.\n" - .string "That didn’t go very well.$" + .string "That didn't go very well.$" AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 .string "Walking around barefoot in this ship\n" @@ -146,7 +140,7 @@ AbandonedShip_Rooms2_1F_Text_238708: @ 8238708 AbandonedShip_Rooms2_1F_Text_23873F: @ 823873F .string "Strength and compassion…\n" - .string "Those are a TRAINER’s treasures!$" + .string "Those are a TRAINER's treasures!$" AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 .string "Ah, there is something about you\n" @@ -155,4 +149,3 @@ AbandonedShip_Rooms2_1F_Text_238779: @ 8238779 AbandonedShip_Rooms2_1F_Text_2387A9: @ 82387A9 .string "In a cabin somewhere on board,\n" .string "I saw something sparkle.$" - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc index 00b3d0fb9..a0b9e3946 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc @@ -2,12 +2,12 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024 .byte 0 AbandonedShip_Rooms2_B1F_EventScript_238025:: @ 8238025 - msgbox AbandonedShip_Rooms2_B1F_Text_23802E, 2 + msgbox AbandonedShip_Rooms2_B1F_Text_23802E, MSGBOX_NPC end AbandonedShip_Rooms2_B1F_Text_23802E: @ 823802E .string "This is a perfect place to go exploring!\n" - .string "It’s exciting here!\p" - .string "I bet there’re amazing treasures on\n" + .string "It's exciting here!\p" + .string "I bet there're amazing treasures on\n" .string "board.$" diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 2a6bc36b6..d64c027a3 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -2,41 +2,38 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92 .byte 0 AbandonedShip_Rooms_1F_EventScript_237A93:: @ 8237A93 - msgbox AbandonedShip_Rooms_1F_Text_237B15, 2 + msgbox AbandonedShip_Rooms_1F_Text_237B15, MSGBOX_NPC end AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C - trainerbattle 0, TRAINER_DEMETRIUS, 0, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A - msgbox AbandonedShip_Rooms_1F_Text_237D41, 6 + trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_237D0C, AbandonedShip_Rooms_1F_Text_237D2A + msgbox AbandonedShip_Rooms_1F_Text_237D41, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 - trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF + trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE - msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4 + msgbox AbandonedShip_Rooms_1F_Text_237BDB, MSGBOX_DEFAULT release end AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF special sub_80B4808 waitmovement 0 - msgbox AbandonedShip_Rooms_1F_Text_237C2A, 4 - setvar VAR_0x8004, 144 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 144 - callstd 8 + msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT + register_matchcall TRAINER_THALIA_1 release end AbandonedShip_Rooms_1F_EventScript_237AFE:: @ 8237AFE - trainerbattle 5, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 - msgbox AbandonedShip_Rooms_1F_Text_237CC9, 6 + trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_237C69, AbandonedShip_Rooms_1F_Text_237CB2 + msgbox AbandonedShip_Rooms_1F_Text_237CC9, MSGBOX_AUTOCLOSE end AbandonedShip_Rooms_1F_Text_237B15: @ 8237B15 - .string "Ships of this sort are rare, so I’m\n" + .string "Ships of this sort are rare, so I'm\n" .string "taking a look around.\p" .string "Hmhm…\n" .string "There appear to be other cabins…$" @@ -50,11 +47,11 @@ AbandonedShip_Rooms_1F_Text_237BB8: @ 8237BB8 AbandonedShip_Rooms_1F_Text_237BDB: @ 8237BDB .string "The man next door…\p" - .string "He says he’s just sightseeing,\n" - .string "but I don’t know about that.$" + .string "He says he's just sightseeing,\n" + .string "but I don't know about that.$" AbandonedShip_Rooms_1F_Text_237C2A: @ 8237C2A - .string "You’re such a tough TRAINER!\n" + .string "You're such a tough TRAINER!\n" .string "Let me register you as a memento!$" AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 @@ -62,20 +59,20 @@ AbandonedShip_Rooms_1F_Text_237C69: @ 8237C69 .string "come back? You must really be curious!$" AbandonedShip_Rooms_1F_Text_237CB2: @ 8237CB2 - .string "Aren’t you too strong?$" + .string "Aren't you too strong?$" AbandonedShip_Rooms_1F_Text_237CC9: @ 8237CC9 - .string "I’m sure that man’s up to something!\n" + .string "I'm sure that man's up to something!\n" .string "He just acts so suspiciously!$" AbandonedShip_Rooms_1F_Text_237D0C: @ 8237D0C .string "Waaah!\n" - .string "I’ve been found! …Huh?$" + .string "I've been found! …Huh?$" AbandonedShip_Rooms_1F_Text_237D2A: @ 8237D2A - .string "Oh, you’re not my mom.$" + .string "Oh, you're not my mom.$" AbandonedShip_Rooms_1F_Text_237D41: @ 8237D41 - .string "I’m in trouble with my mom, so I ran.\n" + .string "I'm in trouble with my mom, so I ran.\n" .string "Keep it a secret where I am!$" diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc index d4a5c9233..470ae8987 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc @@ -7,12 +7,12 @@ AbandonedShip_Rooms_B1F_MapScript1_237FBD: @ 8237FBD end AbandonedShip_Rooms_B1F_EventScript_237FC6:: @ 8237FC6 - msgbox AbandonedShip_Rooms_B1F_Text_237FCF, 2 + msgbox AbandonedShip_Rooms_B1F_Text_237FCF, MSGBOX_NPC end AbandonedShip_Rooms_B1F_Text_237FCF: @ 8237FCF .string "Urrrrppp…\p" - .string "I’m getting queasy just being aboard\n" + .string "I'm getting queasy just being aboard\n" .string "this ship…\p" - .string "It’s not even moving, but…$" + .string "It's not even moving, but…$" diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 18361bca5..f3c42b690 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -51,7 +51,7 @@ AncientTomb_EventScript_239033:: @ 8239033 end AncientTomb_EventScript_239046:: @ 8239046 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 9172c3927..8eb5e60b9 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -8,17 +8,17 @@ AquaHideout_1F_EventScript_233494:: @ 8233494 goto_eq AquaHideout_1F_EventScript_2334BC checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, 4 + msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, 4 + msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, 4 + msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT release end @@ -29,38 +29,38 @@ AquaHideout_1F_EventScript_2334C6:: @ 82334C6 goto_eq AquaHideout_1F_EventScript_2334EE checkflag FLAG_0x0D4 goto_eq AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, 4 + msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, 4 + msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, 4 + msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT release end AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle 2, TRAINER_GRUNT_1, 0, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, 6 + trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 + msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE end AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, 4 + msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT release end AquaHideout_1F_Text_23351D: @ 823351D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s gone off to\n" + .string "Our BOSS isn't here! He's gone off to\n" .string "snatch something important!\p" .string "… …\n" .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_2335E3: @ 82335E3 @@ -74,21 +74,21 @@ AquaHideout_1F_Text_2335E3: @ 82335E3 AquaHideout_1F_Text_23367D: @ 823367D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s gone off to jack a submarine!\p" + .string "Our BOSS isn't here!\n" + .string "He's gone off to jack a submarine!\p" .string "… …\n" .string "Where did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_233739: @ 8233739 .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here! He’s on his way to\n" + .string "Our BOSS isn't here! He's on his way to\n" .string "MT. PYRE on ROUTE 122!\p" .string "… …\n" .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_2337FA: @ 82337FA @@ -101,11 +101,11 @@ AquaHideout_1F_Text_2337FA: @ 82337FA AquaHideout_1F_Text_233884: @ 8233884 .string "What? What? What do you want with\n" .string "TEAM AQUA?\p" - .string "Our BOSS isn’t here!\n" - .string "He’s on his way to SLATEPORT CITY!\p" + .string "Our BOSS isn't here!\n" + .string "He's on his way to SLATEPORT CITY!\p" .string "… …\n" .string "Why did he go?\p" - .string "Wahaha! Do you really think I’d tell\n" + .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" AquaHideout_1F_Text_23393D: @ 823393D diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 22c3406c5..9c660d8b1 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -85,35 +85,35 @@ AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C end AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle 2, TRAINER_GRUNT_2, 0, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, 6 + trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 special sub_80B4808 waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, 4 + msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle 2, TRAINER_GRUNT_3, 0, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, 6 + trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, 4 + msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT release end AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle 0, TRAINER_GRUNT_21, 0, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, 6 + trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA + msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE end AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle 0, TRAINER_GRUNT_25, 0, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, 6 + trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E + msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE end AquaHideout_B1F_Text_233B03: @ 8233B03 @@ -121,12 +121,12 @@ AquaHideout_B1F_Text_233B03: @ 8233B03 .string "our HIDEOUT, you have me to beat!$" AquaHideout_B1F_Text_233B4A: @ 8233B4A - .string "I can’t win at all…$" + .string "I can't win at all…$" AquaHideout_B1F_Text_233B5E: @ 8233B5E - .string "Our HIDEOUT’s secret?\p" - .string "Well, let’s just say…\n" - .string "There’s a submarine at the far end!\p" + .string "Our HIDEOUT's secret?\p" + .string "Well, let's just say…\n" + .string "There's a submarine at the far end!\p" .string "But, by now…\n" .string "Kekekeke…$" @@ -146,7 +146,7 @@ AquaHideout_B1F_Text_233C41: @ 8233C41 AquaHideout_B1F_Text_233C89: @ 8233C89 .string "Yawn… Keeping watch over the\n" - .string "HIDEOUT bores me. I’ll take you on.$" + .string "HIDEOUT bores me. I'll take you on.$" AquaHideout_B1F_Text_233CCA: @ 8233CCA .string "Yawn…\n" @@ -160,12 +160,12 @@ AquaHideout_B1F_Text_233D1B: @ 8233D1B .string "Hey!\n" .string "You there!\p" .string "Which do you think is cooler?\n" - .string "TEAM AQUA’s uniform or TEAM MAGMA’s?$" + .string "TEAM AQUA's uniform or TEAM MAGMA's?$" AquaHideout_B1F_Text_233D6E: @ 8233D6E .string "I lost in a cool way…$" AquaHideout_B1F_Text_233D84: @ 8233D84 .string "If you have a cool uniform, you look\n" - .string "good even in a loss, don’t you think?$" + .string "good even in a loss, don't you think?$" diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 7fbf55b51..584a1a3e1 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -24,8 +24,8 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 end AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle 2, TRAINER_MATT, 0, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, 4 + trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, 4 + msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, AquaHideout_B2F_Movement_2725A4 applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 @@ -46,7 +46,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 delay 20 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, 4 + msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT setflag FLAG_0x070 setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release @@ -67,23 +67,23 @@ AquaHideout_B2F_Movement_233E85: @ 8233E85 step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle 2, TRAINER_GRUNT_4, 0, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, 6 + trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, 4 + msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT release end AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle 0, TRAINER_GRUNT_22, 0, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, 6 + trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE + msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE end AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle 0, TRAINER_GRUNT_26, 0, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, 6 + trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC + msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE end AquaHideout_B2F_Text_233EDD: @ 8233EDD @@ -91,10 +91,10 @@ AquaHideout_B2F_Text_233EDD: @ 8233EDD .string "Got here already, did you?\n" .string "We underestimated you!\p" .string "But this is it!\p" - .string "I’m a cut above the GRUNTS you’ve seen\n" + .string "I'm a cut above the GRUNTS you've seen\n" .string "so far.\p" - .string "I’m not stalling for time.\n" - .string "I’m going to pulverize you!$" + .string "I'm not stalling for time.\n" + .string "I'm going to pulverize you!$" AquaHideout_B2F_Text_233F8D: @ 8233F8D .string "Hehehe…\n" @@ -109,7 +109,7 @@ AquaHideout_B2F_Text_233FF2: @ 8233FF2 .string "Hehehe!\p" .string "Our BOSS has already gone on his way to\n" .string "some cave under the sea!\p" - .string "If you’re going to give chase, you’d\n" + .string "If you're going to give chase, you'd\n" .string "better search the big, wide sea beyond\l" .string "LILYCOVE.\p" .string "But will you find it then?\n" @@ -128,19 +128,19 @@ AquaHideout_B2F_Text_234112: @ 8234112 .string "Is this good enough?$" AquaHideout_B2F_Text_23412D: @ 823412D - .string "Warp panels, the HIDEOUT’s pride\n" + .string "Warp panels, the HIDEOUT's pride\n" .string "and joy!\p" - .string "You’re clueless about where you are,\n" - .string "aren’t you?\p" + .string "You're clueless about where you are,\n" + .string "aren't you?\p" .string "Fluster and tire out the enemy, then\n" - .string "lower the boom! That’s our plan!$" + .string "lower the boom! That's our plan!$" AquaHideout_B2F_Text_2341CE: @ 82341CE - .string "What’s wrong with you?\n" - .string "You’re not tired at all!$" + .string "What's wrong with you?\n" + .string "You're not tired at all!$" AquaHideout_B2F_Text_2341FE: @ 82341FE - .string "That reminds me… I can’t remember\n" + .string "That reminds me… I can't remember\n" .string "where I put the MASTER BALL.\p" .string "If I fail to guard it, our BOSS will\n" .string "chew me out…$" @@ -155,6 +155,6 @@ AquaHideout_B2F_Text_2342CC: @ 82342CC .string "the warp panels…$" AquaHideout_B2F_Text_2342FF: @ 82342FF - .string "I’ll have to learn about how I can\n" + .string "I'll have to learn about how I can\n" .string "battle more effectively…$" diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 84f0ebeea..75ac9a4ec 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -64,7 +64,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 waitmovement 0 @@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitmovement 0 setvar VAR_0x8004, 6 special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C68, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 @@ -82,14 +82,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE5 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF2 waitmovement 0 setvar VAR_0x8004, 5 special CallBattlePalaceFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -106,7 +106,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB:: @ 82575DB waitmovement 0 setvar VAR_0x8004, 6 special CallBattleArenaFunction - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CCE, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257615:: @ 8257615 setvar VAR_0x8004, 2 @@ -135,7 +135,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630 applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08 applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -199,7 +199,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2577D0:: @ 82577D0 goto BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 BattleFrontier_BattleArenaBattleRoom_EventScript_2577DA:: @ 82577DA - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, 5 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0 case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25789A @@ -277,7 +277,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4 @@ -311,7 +311,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C3D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BE4 waitmovement 0 @@ -319,7 +319,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 playse SE_W187 waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257FED, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF4 @@ -335,21 +335,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25804E, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258068, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C @@ -363,14 +363,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_25813F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25819C waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2581CF, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 @@ -379,21 +379,21 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C30 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582A2, MSGBOX_DEFAULT closemessage applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257C3A waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582BB, MSGBOX_DEFAULT BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15 @@ -407,18 +407,18 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15 goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852 applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1 waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258323, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleArenaBattleRoom_Text_25835B waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_258383, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaBattleRoom_EventScript_257852 BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E:: @ 8257B5E - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257C93, MSGBOX_DEFAULT call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C return @@ -451,7 +451,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 playse SE_BAN waitse waitmovement 0 - msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, 4 + msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleArenaBattleRoom_EventScript_241EBA return @@ -652,22 +652,22 @@ BattleFrontier_BattleArenaBattleRoom_Text_25804E: @ 825804E .string "Hmhm…$" BattleFrontier_BattleArenaBattleRoom_Text_258068: @ 8258068 - .string "I don’t know how to say it, but…\n" + .string "I don't know how to say it, but…\n" .string "To put it bluntly, you look pretty weak.\l" - .string "Are you sure you’re up for me?\p" + .string "Are you sure you're up for me?\p" .string "Hmm…\p" .string "Well, all right!\n" - .string "We’ll take things easy to start with!$" + .string "We'll take things easy to start with!$" BattleFrontier_BattleArenaBattleRoom_Text_25810D: @ 825810D - .string "Okay! Let’s see you ignite my passion\n" + .string "Okay! Let's see you ignite my passion\n" .string "for battle!$" BattleFrontier_BattleArenaBattleRoom_Text_25813F: @ 825813F .string "GRETA: Ow, wait a second!\n" .string "You are tough after all!\p" .string "I like you!\n" - .string "Let’s see your FRONTIER PASS.$" + .string "Let's see your FRONTIER PASS.$" BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C .string "The Guts Symbol was embossed on\n" @@ -675,8 +675,8 @@ BattleFrontier_BattleArenaBattleRoom_Text_25819C: @ 825819C BattleFrontier_BattleArenaBattleRoom_Text_2581CF: @ 82581CF .string "Hmm…\p" - .string "It’s going to be fun the next time!\n" - .string "I’m looking forward to it!$" + .string "It's going to be fun the next time!\n" + .string "I'm looking forward to it!$" BattleFrontier_BattleArenaBattleRoom_Text_258213: @ 8258213 .string "GRETA: Hey! Howdy!\n" @@ -690,16 +690,16 @@ BattleFrontier_BattleArenaBattleRoom_Text_2582A2: @ 82582A2 .string "So, are you ready?$" BattleFrontier_BattleArenaBattleRoom_Text_2582BB: @ 82582BB - .string "I won’t allow a halfhearted effort!\n" + .string "I won't allow a halfhearted effort!\n" .string "Be ready for a thrashing!$" BattleFrontier_BattleArenaBattleRoom_Text_2582F9: @ 82582F9 .string "Come on, REFEREE!\n" - .string "Let’s get this started!$" + .string "Let's get this started!$" BattleFrontier_BattleArenaBattleRoom_Text_258323: @ 8258323 .string "GRETA: Gaaah! Blown away!\n" - .string "Let’s see your FRONTIER PASS!$" + .string "Let's see your FRONTIER PASS!$" BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B .string "The Guts Symbol took on\n" @@ -708,5 +708,5 @@ BattleFrontier_BattleArenaBattleRoom_Text_25835B: @ 825835B BattleFrontier_BattleArenaBattleRoom_Text_258383: @ 8258383 .string "Arrrgh!\n" .string "This is so infuriating!\p" - .string "If we ever battle again, I won’t lose!\n" - .string "Don’t you forget it! Bye-bye!$" + .string "If we ever battle again, I won't lose!\n" + .string "Don't you forget it! Bye-bye!$" diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc index a353379c2..5ffb5de3d 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc @@ -14,7 +14,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 waitmovement 0 applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257444 waitmovement 0 - msgbox BattleFrontier_BattleArenaCorridor_Text_257449, 3 + msgbox BattleFrontier_BattleArenaCorridor_Text_257449, MSGBOX_SIGN applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_257446 waitmovement 0 applymovement 255, BattleFrontier_BattleArenaCorridor_Movement_25742C diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index 19976c855..36f864c14 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255C7F:: @ 8255C7F BattleFrontier_BattleArenaLobby_EventScript_255C88:: @ 8255C88 lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256811, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256811, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -51,21 +51,21 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255CF8 BattleFrontier_BattleArenaLobby_EventScript_255CF0:: @ 8255CF0 - msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2572D9, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255CF8:: @ 8255CF8 - msgbox BattleFrontier_BattleArenaLobby_Text_257353, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257353, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleArenaLobby_Text_241520, 9 message BattleFrontier_BattleArenaLobby_Text_256931 waitmessage call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -80,7 +80,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B setvar VAR_0x8006, 0 special CallBattleArenaFunction call BattleFrontier_BattleArenaLobby_EventScript_255D59 - msgbox BattleFrontier_BattleArenaLobby_Text_256A74, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256A74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -135,7 +135,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4 setvar VAR_FRONTIER_FACILITY, 3 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256166, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B message BattleFrontier_BattleArenaLobby_Text_2561EA @@ -162,7 +162,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaLobby_Text_256573, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256573, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleArenaLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -171,7 +171,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8 - msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5 + msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleArenaLobby_EventScript_255FF8 case 1, BattleFrontier_BattleArenaLobby_EventScript_255EE8 @@ -209,7 +209,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2567E6, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -224,7 +224,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54 end BattleFrontier_BattleArenaLobby_EventScript_255F9F:: @ 8255F9F - msgbox BattleFrontier_BattleArenaLobby_Text_25624C, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25624C, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_255E0B BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC @@ -233,11 +233,11 @@ BattleFrontier_BattleArenaLobby_EventScript_255FAC:: @ 8255FAC case 1, BattleFrontier_BattleArenaLobby_EventScript_255FD4 BattleFrontier_BattleArenaLobby_EventScript_255FC7:: @ 8255FC7 - msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2566A8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FD4:: @ 8255FD4 - msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_2565A5, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_256003 BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1 @@ -251,7 +251,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8 special LoadPlayerParty BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB - msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_25621F, MSGBOX_DEFAULT BattleFrontier_BattleArenaLobby_EventScript_256003:: @ 8256003 release @@ -353,24 +353,24 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 end BattleFrontier_BattleArenaLobby_EventScript_2560A6:: @ 82560A6 - msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256B5C, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560AF:: @ 82560AF - msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256BCB, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560B8:: @ 82560B8 - msgbox BattleFrontier_BattleArenaLobby_Text_256C19, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C19, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560C1:: @ 82560C1 - msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, 2 + msgbox BattleFrontier_BattleArenaLobby_Text_256C9A, MSGBOX_NPC end BattleFrontier_BattleArenaLobby_EventScript_2560CA:: @ 82560CA lockall - msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256DB8, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end @@ -388,22 +388,22 @@ BattleFrontier_BattleArenaLobby_EventScript_2560D9:: @ 82560D9 end BattleFrontier_BattleArenaLobby_EventScript_25612C:: @ 825612C - msgbox BattleFrontier_BattleArenaLobby_Text_256E02, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256E02, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_25613A:: @ 825613A - msgbox BattleFrontier_BattleArenaLobby_Text_256F43, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256F43, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256148:: @ 8256148 - msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_256FF2, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end BattleFrontier_BattleArenaLobby_EventScript_256156:: @ 8256156 - msgbox BattleFrontier_BattleArenaLobby_Text_257202, 4 + msgbox BattleFrontier_BattleArenaLobby_Text_257202, MSGBOX_DEFAULT goto BattleFrontier_BattleArenaLobby_EventScript_2560D9 end @@ -440,7 +440,7 @@ BattleFrontier_BattleArenaLobby_Text_25624C: @ 825624C .string "three turns, it goes to judging.\p" .string "If you wish to interrupt your challenge,\n" .string "please save the game.\p" - .string "If you don’t save, you will not be able\n" + .string "If you don't save, you will not be able\n" .string "to continue with your challenge.\p" .string "If you pull off the feat of beating\n" .string "seven TRAINERS in succession,\l" @@ -541,19 +541,19 @@ BattleFrontier_BattleArenaLobby_Text_256B19: @ 8256B19 .string "match on your FRONTIER PASS?$" BattleFrontier_BattleArenaLobby_Text_256B5C: @ 8256B5C - .string "I lost on the REFEREE’s decision…\p" - .string "I don’t think it was a good idea to only\n" + .string "I lost on the REFEREE's decision…\p" + .string "I don't think it was a good idea to only\n" .string "use defensive moves and not attack…$" BattleFrontier_BattleArenaLobby_Text_256BCB: @ 8256BCB .string "I won in judging!\p" .string "Landing hits consistently on\n" - .string "the opponent’s POKéMON worked!$" + .string "the opponent's POKéMON worked!$" BattleFrontier_BattleArenaLobby_Text_256C19: @ 8256C19 .string "Our match was declared a draw.\p" .string "When we ran out of time, both my\n" - .string "POKéMON and the opponent’s had about\l" + .string "POKéMON and the opponent's had about\l" .string "the same amount of HP left.$" BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A @@ -569,7 +569,7 @@ BattleFrontier_BattleArenaLobby_Text_256C9A: @ 8256C9A BattleFrontier_BattleArenaLobby_Text_256DB8: @ 8256DB8 FallarborTown_BattleTentLobby_Text_256DB8: @ 8256DB8 - .string "The Set KO Tourney’s rules are listed.$" + .string "The Set KO Tourney's rules are listed.$" BattleFrontier_BattleArenaLobby_Text_256DDF: @ 8256DDF FallarborTown_BattleTentLobby_Text_256DDF: @ 8256DDF @@ -586,7 +586,7 @@ FallarborTown_BattleTentLobby_Text_256E02: @ 8256E02 .string "The REFEREE will choose the winner\n" .string "based on how the POKéMON battled.\p" .string "Also, a POKéMON cannot be switched out\n" - .string "until its battle’s outcome is decided.$" + .string "until its battle's outcome is decided.$" BattleFrontier_BattleArenaLobby_Text_256F43: @ 8256F43 FallarborTown_BattleTentLobby_Text_256F43: @ 8256F43 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 9b1a77fae..2d147e426 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -46,7 +46,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 waitmovement 0 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT closemessage showobjectat 13, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM compare VAR_TEMP_F, 3 @@ -73,7 +73,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD61:: @ 824BD61 BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 4 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C990, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C77B applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C789 @@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 special CallBattleDomeFunction @@ -94,7 +94,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_TEMP_2, 1 BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA86, MSGBOX_DEFAULT closemessage playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E @@ -199,11 +199,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62:: @ 824BF62 special CallFrontierUtilFunc switch VAR_RESULT case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA04, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E BattleFrontier_BattleDomeBattleRoom_EventScript_24BF96:: @ 824BF96 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CA44, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E special sub_8175280 @@ -217,11 +217,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BF9E:: @ 824BF9E goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C8F5 BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3:: @ 824BFC3 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C9BE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFCC:: @ 824BFCC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CB9D, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5:: @ 824BFD5 @@ -340,11 +340,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C151:: @ 824C151 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C158:: @ 824C158 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEBE, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C161:: @ 824C161 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D232, MSGBOX_DEFAULT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C16A:: @ 824C16A @@ -390,11 +390,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C1CB:: @ 824C1CB case 4, BattleFrontier_BattleDomeBattleRoom_EventScript_24C209 BattleFrontier_BattleDomeBattleRoom_EventScript_24C1FC:: @ 824C1FC - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CEDE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24C211 BattleFrontier_BattleDomeBattleRoom_EventScript_24C209:: @ 824C209 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D26C, MSGBOX_DEFAULT BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 closemessage @@ -431,19 +431,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C211:: @ 824C211 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24CFAE, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0D9, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction @@ -454,14 +454,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C2B9:: @ 824C2B9 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D172, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D1AA waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D1E0, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 @@ -470,19 +470,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C346:: @ 824C346 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleDomeBattleRoom_EventScript_24C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D319, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D43E, MSGBOX_DEFAULT call BattleFrontier_BattleDomeBattleRoom_EventScript_24C400 switch VAR_RESULT case 2, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 9, BattleFrontier_BattleDomeBattleRoom_EventScript_24C420 case 3, BattleFrontier_BattleDomeBattleRoom_EventScript_24C436 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D0F6, MSGBOX_DEFAULT setvar VAR_0x8004, 12 setvar VAR_0x8005, 1 special CallBattleDomeFunction @@ -493,18 +493,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C373:: @ 824C373 closemessage applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C82B waitmovement 0 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D47F, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleDomeBattleRoom_Text_24D522 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D54D, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeBattleRoom_EventScript_24BF62 BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D677, MSGBOX_DEFAULT closemessage applymovement 13, BattleFrontier_BattleDomeBattleRoom_Movement_24C787 applymovement 15, BattleFrontier_BattleDomeBattleRoom_Movement_24C829 @@ -513,7 +513,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C400:: @ 824C400 return BattleFrontier_BattleDomeBattleRoom_EventScript_24C420:: @ 824C420 - msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, 4 + msgbox BattleFrontier_BattleDomeBattleRoom_Text_24D127, MSGBOX_DEFAULT playse SE_W227B call BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E waitse @@ -1055,7 +1055,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CA86: @ 824CA86 .string "What an unbelievable finish!\n" .string "We have a double knockout!\p" .string "In this event, the Battle Tournament\n" - .string "rules call for a REFEREE’S decision.\p" + .string "rules call for a REFEREE'S decision.\p" .string "Please wait while the judging\n" .string "is under way.$" @@ -1155,7 +1155,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CEBE: @ 824CEBE BattleFrontier_BattleDomeBattleRoom_Text_24CEDE: @ 824CEDE .string "And now… The TRAINER standing in\n" - .string "{PLAYER}’s record-setting path…\p" + .string "{PLAYER}'s record-setting path…\p" .string "Yes! The one and only!\n" .string "The BATTLE DOME COMMISSIONER!\l" .string "Our very own DOME ACE!\l" @@ -1168,21 +1168,21 @@ BattleFrontier_BattleDomeBattleRoom_Text_24CF7A: @ 824CF7A BattleFrontier_BattleDomeBattleRoom_Text_24CFAE: @ 824CFAE .string "TUCKER: Ahahah!\p" .string "Do you hear it? This crowd!\n" - .string "They’re all itching to see our match!\p" + .string "They're all itching to see our match!\p" .string "Ahahah!\p" - .string "I bet you’re twitching all over from\n" + .string "I bet you're twitching all over from\n" .string "the tension of getting to battle me!\p" - .string "But don’t you worry about a thing!\p" - .string "I’m the no. 1 star of the BATTLE DOME!\n" + .string "But don't you worry about a thing!\p" + .string "I'm the no. 1 star of the BATTLE DOME!\n" .string "I, TUCKER the DOME ACE, will bathe you\l" .string "in my brilliant glow!$" BattleFrontier_BattleDomeBattleRoom_Text_24D0D9: @ 824D0D9 .string "Your strategy!\n" - .string "Let’s see it!$" + .string "Let's see it!$" BattleFrontier_BattleDomeBattleRoom_Text_24D0F6: @ 824D0F6 - .string "Unbelievable! It’s incredible!\n" + .string "Unbelievable! It's incredible!\n" .string "The victor is {PLAYER}!$" BattleFrontier_BattleDomeBattleRoom_Text_24D127: @ 824D127 @@ -1200,7 +1200,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D1AA: @ 824D1AA BattleFrontier_BattleDomeBattleRoom_Text_24D1E0: @ 824D1E0 .string "… … … … … …\p" - .string "I sorely underestimated you. I won’t\n" + .string "I sorely underestimated you. I won't\n" .string "make the same mistake next time…$" BattleFrontier_BattleDomeBattleRoom_Text_24D232: @ 824D232 @@ -1214,7 +1214,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D26C: @ 824D26C .string "Finally, the legend has returned!\p" .string "Yes, the name of that legend!\n" .string "Our very own DOME ACE!\l" - .string "It’s none other than TUCKER!$" + .string "It's none other than TUCKER!$" BattleFrontier_BattleDomeBattleRoom_Text_24D319: @ 824D319 .string "TUCKER: Ah…\n" @@ -1233,9 +1233,9 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D43E: @ 824D43E .string "I possess! Right here and now!$" BattleFrontier_BattleDomeBattleRoom_Text_24D47F: @ 824D47F - .string "TUCKER: You’re genuinely fantastic!\p" - .string "Never before! I haven’t ever lost in the\n" - .string "times I’ve had to unleash my power.\p" + .string "TUCKER: You're genuinely fantastic!\p" + .string "Never before! I haven't ever lost in the\n" + .string "times I've had to unleash my power.\p" .string "Yes, quite fantastic!\n" .string "Your FRONTIER PASS, please?$" @@ -1244,7 +1244,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D522: @ 824D522 .string "a golden shine!$" BattleFrontier_BattleDomeBattleRoom_Text_24D54D: @ 824D54D - .string "You’re strong, but above all,\n" + .string "You're strong, but above all,\n" .string "you have a unique charm!\p" .string "In you, I see a definite potential for\n" .string "a superstar like me.\p" @@ -1272,6 +1272,6 @@ BattleFrontier_BattleDomeBattleRoom_Text_24D6BE: @ 824D6BE .string "The winner is…\n" .string "Oh, my goodness!\l" .string "The winner is our very own DOME ACE!\l" - .string "It’s TUCKER!\p" + .string "It's TUCKER!\p" .string "Congratulations! And thank you!\n" - .string "Let’s hear it for the DOME ACE, TUCKER!$" + .string "Let's hear it for the DOME ACE, TUCKER!$" diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 669deeeaa..a4a719090 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -34,7 +34,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249839:: @ 8249839 BattleFrontier_BattleDomeLobby_EventScript_249842:: @ 8249842 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A45F, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -63,14 +63,14 @@ BattleFrontier_BattleDomeLobby_EventScript_24989B:: @ 824989B special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleDomeLobby_EventScript_2498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A4E9, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_2498C9 BattleFrontier_BattleDomeLobby_EventScript_2498C1:: @ 82498C1 - msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AD67, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 - msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24ADB1, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9 @@ -100,7 +100,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9 BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, MSGBOX_DEFAULT message BattleFrontier_BattleDomeLobby_Text_24A5D6 waitmessage special LoadPlayerParty @@ -141,7 +141,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E4:: @ 82499E4 call BattleFrontier_BattleDomeLobby_EventScript_23E8B4 BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -149,7 +149,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2499E9:: @ 82499E9 BattleFrontier_BattleDomeLobby_EventScript_2499F9:: @ 82499F9 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A5FE, MSGBOX_DEFAULT message BattleFrontier_BattleDomeLobby_Text_24A61A waitmessage setvar VAR_0x8004, 13 @@ -215,7 +215,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleDomeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -224,7 +224,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleDomeLobby_EventScript_249C61 - msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, 5 + msgbox BattleFrontier_BattleDomeLobby_Text_24A1C6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomeLobby_EventScript_249C61 case 1, BattleFrontier_BattleDomeLobby_EventScript_249B60 @@ -262,7 +262,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2 special CallFrontierUtilFunc setvar VAR_0x8004, 15 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeLobby_Text_24A437, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A437, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleDomeLobby_EventScript_249C6E special HealPlayerParty @@ -284,11 +284,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249C15:: @ 8249C15 case 1, BattleFrontier_BattleDomeLobby_EventScript_249C3D BattleFrontier_BattleDomeLobby_EventScript_249C30:: @ 8249C30 - msgbox BattleFrontier_BattleDomeLobby_Text_24A353, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A353, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C3D:: @ 8249C3D - msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A2AB, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249C6C BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A @@ -302,7 +302,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61 special LoadPlayerParty BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64 - msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F74, MSGBOX_DEFAULT BattleFrontier_BattleDomeLobby_EventScript_249C6C:: @ 8249C6C release @@ -350,11 +350,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249CF5:: @ 8249CF5 return BattleFrontier_BattleDomeLobby_EventScript_249CFD:: @ 8249CFD - msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249EB7, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D06:: @ 8249D06 - msgbox BattleFrontier_BattleDomeLobby_Text_24A664, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A664, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D0F:: @ 8249D0F @@ -366,11 +366,11 @@ BattleFrontier_BattleDomeLobby_EventScript_249D15:: @ 8249D15 return BattleFrontier_BattleDomeLobby_EventScript_249D1B:: @ 8249D1B - msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_249F8E, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D24:: @ 8249D24 - msgbox BattleFrontier_BattleDomeLobby_Text_24A721, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24A721, MSGBOX_DEFAULT return BattleFrontier_BattleDomeLobby_EventScript_249D2D:: @ 8249D2D @@ -449,56 +449,54 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 end BattleFrontier_BattleDomeLobby_EventScript_249DC9:: @ 8249DC9 - msgbox BattleFrontier_BattleDomeLobby_Text_24A966, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A966, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DD2:: @ 8249DD2 - msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9A9, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DDB:: @ 8249DDB - msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24A9EC, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DE4:: @ 8249DE4 - msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, 3 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA31, MSGBOX_SIGN return BattleFrontier_BattleDomeLobby_EventScript_249DED:: @ 8249DED setvar VAR_0x8004, 20 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AA76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249DFE:: @ 8249DFE - msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AB94, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E07:: @ 8249E07 - msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24AC76, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E10:: @ 8249E10 - msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, 2 + msgbox BattleFrontier_BattleDomeLobby_Text_24ACD3, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E19:: @ 8249E19 - msgbox BattleFrontier_OutsideWest_Text_24AB06, 2 + msgbox BattleFrontier_OutsideWest_Text_24AB06, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E22:: @ 8249E22 - loadword 0, BattleFrontier_OutsideWest_Text_24AB44 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB44, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_249E2B:: @ 8249E2B - loadword 0, BattleFrontier_OutsideWest_Text_24AB75 - callstd 2 + msgbox BattleFrontier_OutsideWest_Text_24AB75, MSGBOX_NPC end BattleFrontier_BattleDomeLobby_EventScript_249E34:: @ 8249E34 lockall - msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AE63, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end @@ -515,17 +513,17 @@ BattleFrontier_BattleDomeLobby_EventScript_249E43:: @ 8249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E8B:: @ 8249E8B - msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AEAE, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249E99:: @ 8249E99 - msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24AF4C, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end BattleFrontier_BattleDomeLobby_EventScript_249EA7:: @ 8249EA7 - msgbox BattleFrontier_BattleDomeLobby_Text_24B073, 4 + msgbox BattleFrontier_BattleDomeLobby_Text_24B073, MSGBOX_DEFAULT goto BattleFrontier_BattleDomeLobby_EventScript_249E43 end @@ -558,14 +556,14 @@ BattleFrontier_BattleDomeLobby_Text_249F8E: @ 8249F8E .string "The other two POKéMON can battle\n" .string "one at a time.\p" .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" + .string "examining the opponent's trio.\p" .string "You win the tournament by defeating\n" .string "four TRAINERS.\p" .string "Battle Points are awarded to\n" .string "the tournament winner.\p" .string "If you want to interrupt your\n" .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleDomeLobby_Text_24A1C6: @ 824A1C6 @@ -583,7 +581,7 @@ BattleFrontier_BattleDomeLobby_Text_24A26E: @ 824A26E BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "Also, the POKéMON must be holding\n" .string "different kinds of items.\p" .string "EGGS{STR_VAR_1} ineligible.\p" @@ -591,7 +589,7 @@ BattleFrontier_BattleDomeLobby_Text_24A2AB: @ 824A2AB BattleFrontier_BattleDomeLobby_Text_24A353: @ 824A353 .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -605,7 +603,7 @@ BattleFrontier_BattleDomeLobby_Text_24A437: @ 824A437 BattleFrontier_BattleDomeLobby_Text_24A45F: @ 824A45F .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" + .string "You didn't save before you quit your\n" .string "challenge last time.\p" .string "Because of that, your challenge so far\n" .string "has been disqualified. Sorry!$" @@ -635,7 +633,7 @@ BattleFrontier_BattleDomeLobby_Text_24A5D6: @ 824A5D6 .string "Please wait.$" BattleFrontier_BattleDomeLobby_Text_24A5FE: @ 824A5FE - .string "We’ve been waiting for you!$" + .string "We've been waiting for you!$" BattleFrontier_BattleDomeLobby_Text_24A61A: @ 824A61A .string "Before I show you to the BATTLE DOME,\n" @@ -663,30 +661,30 @@ BattleFrontier_BattleDomeLobby_Text_24A721: @ 824A721 .string "The remaining two POKéMON must take\n" .string "part in a DOUBLE BATTLE.\p" .string "Choose the two battling POKéMON after\n" - .string "examining the opponent’s trio.\p" + .string "examining the opponent's trio.\p" .string "You win the tournament by defeating\n" .string "four TRAINERS.\p" .string "Battle Points are awarded to\n" .string "the tournament winner.\p" .string "If you want to interrupt your\n" .string "tournament, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleDomeLobby_Text_24A966: @ 824A966 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Level 50 SINGLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24A9A9: @ 824A9A9 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Level 50 DOUBLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24A9EC: @ 824A9EC - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Open Level SINGLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24AA31: @ 824AA31 - .string "They’re the results of the last\n" + .string "They're the results of the last\n" .string "Open Level DOUBLE BATTLE Tournament.$" BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 @@ -699,7 +697,7 @@ BattleFrontier_BattleDomeLobby_Text_24AA76: @ 824AA76 BattleFrontier_OutsideWest_Text_24AB06: @ 824AB06 .string "The BATTLE FRONTIER…\n" - .string "I’ve long dreamed about a place like it.$" + .string "I've long dreamed about a place like it.$" BattleFrontier_OutsideWest_Text_24AB44: @ 824AB44 .string "The BATTLE DOME\n" @@ -724,9 +722,9 @@ BattleFrontier_BattleDomeLobby_Text_24AC76: @ 824AC76 .string "Of course I got trashed…$" BattleFrontier_BattleDomeLobby_Text_24ACD3: @ 824ACD3 - .string "I would’ve won if I’d kept this POKéMON\n" + .string "I would've won if I'd kept this POKéMON\n" .string "held in reserve.\p" - .string "You need to check your opponent’s\n" + .string "You need to check your opponent's\n" .string "POKéMON carefully before choosing\l" .string "your battling POKéMON.$" @@ -766,7 +764,7 @@ BattleFrontier_BattleDomeLobby_Text_24AF4C: @ 824AF4C .string "The Tournament Tree will provide\n" .string "several kinds of data.\p" .string "The data on view includes the previous\n" - .string "tournament’s results, the POKéMON held\l" + .string "tournament's results, the POKéMON held\l" .string "by TRAINERS, and the battle styles of\l" .string "TRAINERS.$" diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index d870ee8ea..28d634162 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -69,7 +69,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B33F:: @ 824B33F goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B349:: @ 824B349 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, 5 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA69, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F case 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB @@ -104,7 +104,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special CallBattleDomeFunction @@ -131,19 +131,19 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A:: @ 824B40A return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B449:: @ 824B449 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B452:: @ 824B452 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9FD, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B45B:: @ 824B45B - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA21, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B464:: @ 824B464 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BA46, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D @@ -167,7 +167,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D special CallBattleDomeFunction setvar VAR_0x8004, 9 special CallBattleDomeFunction - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B748, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F waitmovement 0 @@ -221,28 +221,28 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B54C:: @ 824B54C BattleFrontier_BattleDomePreBattleRoom_EventScript_24B58B:: @ 824B58B checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BB2E, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5A0:: @ 824B5A0 checkflag FLAG_TEMP_1 goto_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BBAC, MSGBOX_DEFAULT setflag FLAG_TEMP_1 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5B5:: @ 824B5B5 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC2A, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24BC63, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 setvar VAR_TEMP_0, 1 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, MSGBOX_DEFAULT special LoadPlayerParty setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 @@ -268,15 +268,15 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600:: @ 824B600 return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B634:: @ 824B634 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B63D:: @ 824B63D - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B7F1, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 - msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, 4 + msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B83F, MSGBOX_DEFAULT return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F @@ -325,7 +325,7 @@ BattleFrontier_BattleDomePreBattleRoom_Text_24B748: @ 824B748 BattleFrontier_BattleDomePreBattleRoom_Text_24B760: @ 824B760 .string "Thank you for competing!\p" - .string "I’ll restore your POKéMON to\n" + .string "I'll restore your POKéMON to\n" .string "full health.$" BattleFrontier_BattleDomePreBattleRoom_Text_24B7A3: @ 824B7A3 @@ -358,11 +358,11 @@ BattleFrontier_BattleDomePreBattleRoom_Text_24B8E6: @ 824B8E6 BattleFrontier_BattleDomePreBattleRoom_Text_24B94E: @ 824B94E .string "Congratulations for advancing\n" .string "to the final match.\p" - .string "You’re one win from the championship.\n" + .string "You're one win from the championship.\n" .string "Are you ready?$" BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5: @ 824B9B5 - .string "{PLAYER}’s next opponent\n" + .string "{PLAYER}'s next opponent\n" .string "is this TRAINER.$" BattleFrontier_BattleDomePreBattleRoom_Text_24B9D9: @ 824B9D9 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 74b10e0f0..ab3ea4d7c 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -51,7 +51,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 .2byte 0 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE3B:: @ 825AE3B - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2, MSGBOX_DEFAULT closemessage applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8004, 5 special CallBattlePalaceFunction lockall - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_0x8004, 2 @@ -153,13 +153,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF9C:: @ 825AF9C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25AFEF:: @ 825AFEF - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C @@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B42D, MSGBOX_DEFAULT closemessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -180,7 +180,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B00C:: @ 825B00C waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B498, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 @@ -189,13 +189,13 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B051:: @ 825B051 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B517, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleFactoryBattleRoom_EventScript_25B07E:: @ 825B07E - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF, MSGBOX_DEFAULT call BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B @@ -206,7 +206,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7, MSGBOX_DEFAULT waitmessage applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_25B182 waitmovement 0 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B09B:: @ 825B09B waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, 4 + msgbox BattleFrontier_BattleFactoryBattleRoom_Text_25B66D, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 @@ -318,21 +318,21 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B1E2: @ 825B1E2 .string "Get a move on!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B1FB: @ 825B1FB - .string "Hey, my name’s NOLAND!\n" - .string "I’m basically in charge of this place,\l" - .string "which is why I’m the FACTORY HEAD!\p" + .string "Hey, my name's NOLAND!\n" + .string "I'm basically in charge of this place,\l" + .string "which is why I'm the FACTORY HEAD!\p" .string "I had a look at your Battle Swap data.\p" .string "You seem to have the right idea,\n" - .string "but you’re still square in your head!\p" - .string "Listen up, okay? Knowledge isn’t only\n" + .string "but you're still square in your head!\p" + .string "Listen up, okay? Knowledge isn't only\n" .string "about reading books or doing desk work.\p" .string "Just doing that sort of thing…\n" .string "It may as well be useless!\p" .string "You have to experience things with\n" .string "your heart and your body, understand?\p" - .string "I’ll take you on under the same\n" + .string "I'll take you on under the same\n" .string "conditions as you.\p" - .string "I’ll be using rental POKéMON, too!$" + .string "I'll be using rental POKéMON, too!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 .string "Shake out every last bit of your\n" @@ -340,7 +340,7 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B3F1: @ 825B3F1 BattleFrontier_BattleFactoryBattleRoom_Text_25B42D: @ 825B42D .string "NOLAND: Smart going!\n" - .string "Let’s see your FRONTIER PASS.$" + .string "Let's see your FRONTIER PASS.$" BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 .string "The Knowledge Symbol was embossed\n" @@ -348,19 +348,19 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B460: @ 825B460 BattleFrontier_BattleFactoryBattleRoom_Text_25B498: @ 825B498 .string "Heh…\n" - .string "You’re a pretty bright spark…\p" - .string "Next time, I’ll come after you hard.\n" + .string "You're a pretty bright spark…\p" + .string "Next time, I'll come after you hard.\n" .string "No holds barred, understand?\p" .string "You keep up your studies!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B517: @ 825B517 - .string "NOLAND: Hey, hey! How’s it going?\n" + .string "NOLAND: Hey, hey! How's it going?\n" .string "You keeping up with your studies?\p" .string "…Oh?\p" - .string "You’ve taken on a harder look than\n" + .string "You've taken on a harder look than\n" .string "the last time I saw you.\p" .string "Now, this should be fun!\n" - .string "I’m getting excited, hey!$" + .string "I'm getting excited, hey!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF .string "All right!\n" @@ -368,9 +368,9 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B5CF: @ 825B5CF BattleFrontier_BattleFactoryBattleRoom_Text_25B5E7: @ 825B5E7 .string "NOLAND: What the…\n" - .string "You’re getting out of my league!\p" + .string "You're getting out of my league!\p" .string "Sheesh!\n" - .string "Let’s see that FRONTIER PASS!$" + .string "Let's see that FRONTIER PASS!$" BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 .string "The Knowledge Symbol took on\n" @@ -378,7 +378,7 @@ BattleFrontier_BattleFactoryBattleRoom_Text_25B640: @ 825B640 BattleFrontier_BattleFactoryBattleRoom_Text_25B66D: @ 825B66D .string "Pfft, man!\p" - .string "That’s absolutely the last time\n" + .string "That's absolutely the last time\n" .string "I lose to you!\p" .string "We have to do this again, hey?$" diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc index 6ea24b81f..b387fc048 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258431:: @ 8258431 BattleFrontier_BattleFactoryLobby_EventScript_25843A:: @ 825843A lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258ECA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 8 special CallBattleFactoryFunction @@ -57,16 +57,16 @@ BattleFrontier_BattleFactoryLobby_EventScript_25849B:: @ 825849B special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleFactoryLobby_EventScript_2584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258D93, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleFactoryLobby_EventScript_2584C6 BattleFrontier_BattleFactoryLobby_EventScript_2584BD:: @ 82584BD - msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25926A, MSGBOX_DEFAULT waitmessage BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6 - msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2592BD, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleFactoryLobby_Text_241520, 9 @@ -116,7 +116,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25857D:: @ 825857D call BattleFrontier_BattleFactoryLobby_EventScript_23E8B4 BattleFrontier_BattleFactoryLobby_EventScript_258582:: @ 8258582 - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -184,7 +184,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258653:: @ 8258653 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, 5 + msgbox BattleFrontier_BattleFactoryLobby_Text_258C27, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryLobby_EventScript_25879A case 1, BattleFrontier_BattleFactoryLobby_EventScript_2586B9 @@ -216,7 +216,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A special SavePlayerParty - msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, MSGBOX_DEFAULT closemessage compare VAR_FRONTIER_BATTLE_MODE, 0 call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_25875C @@ -256,7 +256,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A special LoadPlayerParty BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D - msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, MSGBOX_DEFAULT release end @@ -275,11 +275,11 @@ BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 - msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2588EE, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587BA:: @ 82587BA - msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_258F93, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587C3:: @ 82587C3 @@ -291,11 +291,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587C9:: @ 82587C9 return BattleFrontier_BattleFactoryLobby_EventScript_2587CF:: @ 82587CF - msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2589B3, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587D8:: @ 82587D8 - msgbox BattleFrontier_BattleFactoryLobby_Text_259058, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259058, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1 @@ -321,26 +321,26 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA end BattleFrontier_BattleFactoryLobby_EventScript_258813:: @ 8258813 - msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2593D7, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_25881C:: @ 825881C - msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2594E5, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258825:: @ 8258825 lock - msgbox BattleFrontier_BattleFactoryLobby_Text_259547, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259547, MSGBOX_DEFAULT release end BattleFrontier_BattleFactoryLobby_EventScript_258830:: @ 8258830 - msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, 2 + msgbox BattleFrontier_BattleFactoryLobby_Text_2595C4, MSGBOX_NPC end BattleFrontier_BattleFactoryLobby_EventScript_258839:: @ 8258839 lockall - msgbox BattleFrontier_BattleFactoryLobby_Text_259721, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259721, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end @@ -359,27 +359,27 @@ BattleFrontier_BattleFactoryLobby_EventScript_258848:: @ 8258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588A6:: @ 82588A6 - msgbox BattleFrontier_BattleFactoryLobby_Text_259766, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259766, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588B4:: @ 82588B4 - msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_2597FB, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588C2:: @ 82588C2 - msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_25987E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588D0:: @ 82588D0 - msgbox BattleFrontier_BattleFactoryLobby_Text_259920, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259920, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end BattleFrontier_BattleFactoryLobby_EventScript_2588DE:: @ 82588DE - msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, 4 + msgbox BattleFrontier_BattleFactoryLobby_Text_259A5E, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryLobby_EventScript_258848 end @@ -413,7 +413,7 @@ BattleFrontier_BattleFactoryLobby_Text_2589B3: @ 82589B3 .string "a row, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save, you will be\n" + .string "If you don't save, you will be\n" .string "disqualified from your challenge.$" BattleFrontier_BattleFactoryLobby_Text_258BC5: @ 8258BC5 @@ -446,7 +446,7 @@ BattleFrontier_BattleFactoryLobby_Text_258D54: @ 8258D54 .string "for our rental POKéMON.$" BattleFrontier_BattleFactoryLobby_Text_258D93: @ 8258D93 - .string "Congratulations! You’ve won seven\n" + .string "Congratulations! You've won seven\n" .string "straight Battle Swap matches!$" BattleFrontier_BattleFactoryLobby_Text_258DD3: @ 8258DD3 @@ -460,18 +460,18 @@ BattleFrontier_BattleFactoryLobby_Text_258E1C: @ 8258E1C .string "some Battle Points.$" BattleFrontier_BattleFactoryLobby_Text_258E77: @ 8258E77 - .string "We’ve been waiting for you!\p" + .string "We've been waiting for you!\p" .string "Before we resume your challenge,\n" .string "I must save the game.$" BattleFrontier_BattleFactoryLobby_Text_258ECA: @ 8258ECA - .string "I’m sorry to say this, but you didn’t\n" + .string "I'm sorry to say this, but you didn't\n" .string "save before you quit playing last time.\p" .string "As a result, you have been disqualified\n" .string "from your challenge.$" BattleFrontier_BattleFactoryLobby_Text_258F55: @ 8258F55 - .string "We’ll return your personal POKéMON.$" + .string "We'll return your personal POKéMON.$" BattleFrontier_BattleFactoryLobby_Text_258F79: @ 8258F79 .string "{PLAYER} received the prize\n" @@ -503,7 +503,7 @@ BattleFrontier_BattleFactoryLobby_Text_259058: @ 8259058 .string "a row, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleFactoryLobby_Text_25926A: @ 825926A @@ -531,11 +531,11 @@ BattleFrontier_BattleFactoryLobby_Text_2593D7: @ 82593D7 .string "Hi!\n" .string "You, there!\p" .string "Are you thinking that the events here\n" - .string "are easy since you don’t need to have\l" + .string "are easy since you don't need to have\l" .string "a raised team of POKéMON?\p" - .string "I wouldn’t be too sure about winning\n" + .string "I wouldn't be too sure about winning\n" .string "that easily.\p" - .string "If you don’t have thorough knowledge\n" + .string "If you don't have thorough knowledge\n" .string "about POKéMON and their moves,\l" .string "it will be tough to keep winning.$" @@ -545,20 +545,20 @@ BattleFrontier_BattleFactoryLobby_Text_2594E5: @ 82594E5 .string "They wiped the floor with us…$" BattleFrontier_BattleFactoryLobby_Text_259547: @ 8259547 - .string "Things haven’t been going my way\n" + .string "Things haven't been going my way\n" .string "at all.\p" - .string "You need to check your opponent’s\n" + .string "You need to check your opponent's\n" .string "POKéMON during battle to see if\l" - .string "they’re any good.$" + .string "they're any good.$" BattleFrontier_BattleFactoryLobby_Text_2595C4: @ 82595C4 .string "You know how the staff here give you\n" .string "a few hints about your next opponent?\p" - .string "Well, I’m a full-grown man, but I have\n" + .string "Well, I'm a full-grown man, but I have\n" .string "trouble figuring out their hints.$" BattleFrontier_BattleFactoryLobby_Text_259658: @ 8259658 - .string "Like, I’m really tough, but I get bored\n" + .string "Like, I'm really tough, but I get bored\n" .string "really easily, so I just kept swapping\l" .string "and battling over and over.\p" .string "So anyway, when I kept entering\n" @@ -589,14 +589,14 @@ BattleFrontier_BattleFactoryLobby_Text_2597FB: @ 82597FB BattleFrontier_BattleFactoryLobby_Text_25987E: @ 825987E .string "After every battle you win, you may\n" .string "swap for one of your defeated\l" - .string "opponent’s POKéMON.\p" + .string "opponent's POKéMON.\p" .string "You will not be able to swap POKéMON\n" .string "with the seventh TRAINER in the event.$" BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 .string "There are two key points to be aware\n" .string "of when swapping POKéMON.\p" - .string "First, when swapping, you can’t check\n" + .string "First, when swapping, you can't check\n" .string "the stats of the POKéMON you are\l" .string "about to receive.\p" .string "Second, the POKéMON on your team\n" @@ -607,5 +607,5 @@ BattleFrontier_BattleFactoryLobby_Text_259920: @ 8259920 BattleFrontier_BattleFactoryLobby_Text_259A5E: @ 8259A5E .string "In the Open Level, the rental POKéMON\n" - .string "and the opposing TRAINERS’ POKéMON\l" + .string "and the opposing TRAINERS' POKéMON\l" .string "are all Level 100.$" diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index d99fed1b2..a212ce38f 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -43,7 +43,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 8 special CallBattleFactoryFunction @@ -52,7 +52,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259AF9:: @ 8259AF9 waitstate BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74:: @ 8259B74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB96, MSGBOX_DEFAULT closemessage call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_23F2B7 compare VAR_RESULT, 0 @@ -69,7 +69,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 special CallBattleFactoryFunction setvar VAR_0x8004, 16 special CallBattleFactoryFunction - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -79,15 +79,15 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 waitse - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC15, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3 waitmovement 0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89, MSGBOX_DEFAULT closemessage delay 16 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 @@ -148,7 +148,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D2E:: @ 8259D2E goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D38:: @ 8259D38 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47 @@ -174,7 +174,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259D98:: @ 8259D98 setorcopyvar VAR_0x8006, VAR_RESULT call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 @@ -189,7 +189,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2:: @ 8259DF2 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 setvar VAR_0x8004, 8 special CallBattleFactoryFunction - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB6C, MSGBOX_DEFAULT goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D:: @ 8259E1D @@ -248,7 +248,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4, MSGBOX_DEFAULT compare VAR_0x8005, 0 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62 compare VAR_0x8005, 1 @@ -288,75 +288,75 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E93:: @ 8259E93 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F62:: @ 8259F62 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F6B:: @ 8259F6B - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A597, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F74:: @ 8259F74 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A66B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F7D:: @ 8259F7D - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A5DF, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F86:: @ 8259F86 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A625, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F8F:: @ 8259F8F - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A73B, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259F98:: @ 8259F98 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6F8, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FA1:: @ 8259FA1 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A77F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FAA:: @ 8259FAA - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A84E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FB3:: @ 8259FB3 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A43E, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FBC:: @ 8259FBC - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A482, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FC5:: @ 8259FC5 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A50F, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FCE:: @ 8259FCE - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A4C7, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FD7:: @ 8259FD7 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A6B1, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE0:: @ 8259FE0 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A554, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FE9:: @ 8259FE9 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A7C4, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FF2:: @ 8259FF2 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A80A, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259FFB:: @ 8259FFB - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, 4 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25A893, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 @@ -381,39 +381,39 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A004:: @ 825A004 return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A068:: @ 825A068 - msgbox Text_StyleUnrestrained, 4 + msgbox Text_StyleUnrestrained, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A071:: @ 825A071 - msgbox Text_StyleTotalPreparation, 4 + msgbox Text_StyleTotalPreparation, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A07A:: @ 825A07A - msgbox Text_StyleSlowAndSteady, 4 + msgbox Text_StyleSlowAndSteady, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A083:: @ 825A083 - msgbox Text_StyleEndurance, 4 + msgbox Text_StyleEndurance, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A08C:: @ 825A08C - msgbox Text_StyleHighRisk, 4 + msgbox Text_StyleHighRisk, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A095:: @ 825A095 - msgbox Text_StyleWeakenFoe, 4 + msgbox Text_StyleWeakenFoe, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A09E:: @ 825A09E - msgbox Text_StyleImpossibleToPredict, 4 + msgbox Text_StyleImpossibleToPredict, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0A7:: @ 825A0A7 - msgbox Text_StyleDependsOnFlow, 4 + msgbox Text_StyleDependsOnFlow, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B0:: @ 825A0B0 - msgbox Text_StyleFlexible, 4 + msgbox Text_StyleFlexible, MSGBOX_DEFAULT return BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9:: @ 825A0B9 @@ -439,8 +439,8 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A110:: @ 825A110 case 127, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A146:: @ 825A146 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, 4 - msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, 5 + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259B74 case 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259DF2 @@ -567,7 +567,7 @@ SlateportCity_BattleTentCorridor_Text_25A37A: @ 825A37A .string "Battle Swap challenge?$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3B4: @ 825A3B4 - .string "I’ve conducted a little investigation\n" + .string "I've conducted a little investigation\n" .string "about your upcoming opponent.$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25A3F8: @ 825A3F8 @@ -656,7 +656,7 @@ Text_StyleHighRisk: @ 825A94C Text_StyleDependsOnFlow: @ 825A98C .string "The favorite battle style appears to\n" - .string "depend on the battle’s flow.$" + .string "depend on the battle's flow.$" Text_StyleTotalPreparation: @ 825A9CE .string "The favorite battle style appears to\n" @@ -712,9 +712,9 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC58: @ 825AC58 BattleFrontier_BattleFactoryPreBattleRoom_Text_25AC89: @ 825AC89 .string "Oh, my…\n" .string "Sorry to keep you waiting!\p" - .string "I have a message from this facility’s\n" + .string "I have a message from this facility's\n" .string "boss, the FACTORY HEAD.\p" - .string "He says, “We’re going to do it!\n" + .string "He says, “We're going to do it!\n" .string "Come here right now!”$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 @@ -722,5 +722,5 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD20: @ 825AD20 .string "Are you prepared to face him?$" BattleFrontier_BattleFactoryPreBattleRoom_Text_25AD61: @ 825AD61 - .string "I’m terribly sorry, but I can’t tell you\n" + .string "I'm terribly sorry, but I can't tell you\n" .string "anything about the FACTORY HEAD.$" diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index a179aec55..ccada959e 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF waitmovement 0 setvar VAR_0x8004, 5 special CallBattlePalaceFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -92,7 +92,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -156,7 +156,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAAA:: @ 824FAAA goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A BattleFrontier_BattlePalaceBattleRoom_EventScript_24FAB4:: @ 824FAB4 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, 5 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_24F98A case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F @@ -200,7 +200,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB3F:: @ 824FB3F BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB61:: @ 824FB61 compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2500DD, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB79:: @ 824FB79 @@ -227,7 +227,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FBD0:: @ 824FBD0 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 call BattleFrontier_BattlePalaceBattleRoom_EventScript_242170 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25017C, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97 @@ -249,13 +249,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FC06:: @ 824FC06 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2501C1, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCAA:: @ 824FCAA - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502C4, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7 @@ -268,10 +268,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2502FF, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25036D, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_2503DC waitmessage @@ -283,7 +283,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A @@ -292,13 +292,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD3A:: @ 824FD3A special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250485, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD67:: @ 824FD67 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250572, MSGBOX_DEFAULT call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84 @@ -311,10 +311,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_25057E, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250629, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePalaceBattleRoom_Text_250699 waitmessage @@ -326,7 +326,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84 applymovement 1, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, 4 + msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7:: @ 824FDF7 @@ -600,26 +600,26 @@ BattleFrontier_BattlePalaceBattleRoom_Text_25036D: @ 825036D .string "My, my, if only you could maintain that\n" .string "facade of distinguished authority…\p" .string "Here!\n" - .string "Let’s see your FRONTIER PASS!$" + .string "Let's see your FRONTIER PASS!$" BattleFrontier_BattlePalaceBattleRoom_Text_2503DC: @ 82503DC .string "The Spirits Symbol was embossed on\n" .string "the FRONTIER PASS!$" BattleFrontier_BattlePalaceBattleRoom_Text_250412: @ 8250412 - .string "SPENSER: Your POKéMON’s eyes are \n" + .string "SPENSER: Your POKéMON's eyes are \n" .string "truly clear and unclouded.\p" .string "I will eagerly await the next\n" .string "opportunity to see you.$" BattleFrontier_BattlePalaceBattleRoom_Text_250485: @ 8250485 .string "SPENSER: Gwahahah!\n" - .string "You’ve battled your way up again?\p" + .string "You've battled your way up again?\p" .string "You must have developed a truly\n" .string "formidable bond with your POKéMON.\p" .string "So be it!\p" - .string "This time, I won’t bluster or hold back.\n" - .string "This time, there’s no fooling around.\p" + .string "This time, I won't bluster or hold back.\n" + .string "This time, there's no fooling around.\p" .string "Ready now?\n" .string "Prepare to lose!$" diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc index 23bad0421..199a67fa6 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc @@ -60,23 +60,23 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F581:: @ 824F581 end BattleFrontier_BattlePalaceCorridor_EventScript_24F58B:: @ 824F58B - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F5DD, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F594:: @ 824F594 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F65B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F59D:: @ 824F59D - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F718, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5A6:: @ 824F5A6 - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F78C, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF - msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, 4 + msgbox BattleFrontier_BattlePalaceCorridor_Text_24F7D4, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 @@ -141,18 +141,18 @@ BattleFrontier_BattlePalaceCorridor_Text_24F65B: @ 824F65B .string "Rather than trying to make a POKéMON\n" .string "do what it dislikes, try to let it do\l" .string "what it likes and is good at doing.\p" - .string "Put yourself in the POKéMON’s position\n" + .string "Put yourself in the POKéMON's position\n" .string "and consider what moves it would like.$" BattleFrontier_BattlePalaceCorridor_Text_24F718: @ 824F718 - .string "A POKéMON’s nature is a remarkable\n" + .string "A POKéMON's nature is a remarkable\n" .string "thing…\p" .string "Some POKéMON behave in a completely\n" .string "different way when they are cornered.$" BattleFrontier_BattlePalaceCorridor_Text_24F78C: @ 824F78C .string "Are you beginning to understand how\n" - .string "a POKéMON’s nature makes it behave?$" + .string "a POKéMON's nature makes it behave?$" BattleFrontier_BattlePalaceCorridor_Text_24F7D4: @ 824F7D4 .string "Ah… I see a strong, heartfelt bond\n" diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 82d3aa5cf..c81331ddc 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -27,7 +27,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D7C7:: @ 824D7C7 BattleFrontier_BattlePalaceLobby_EventScript_24D7D0:: @ 824D7D0 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E636, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -51,21 +51,21 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D817:: @ 824D817 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E497, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D840 BattleFrontier_BattlePalaceLobby_EventScript_24D838:: @ 824D838 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EE81, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24D840:: @ 824D840 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EEB9, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePalaceLobby_Text_241520, 9 message BattleFrontier_BattlePalaceLobby_Text_24E4F7 waitmessage call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -80,7 +80,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873 setvar VAR_0x8006, 0 special CallBattlePalaceFunction call BattleFrontier_BattlePalaceLobby_EventScript_24D8A1 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -115,7 +115,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D907:: @ 824D907 BattleFrontier_BattlePalaceLobby_EventScript_24D908:: @ 824D908 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E5D8, MSGBOX_DEFAULT message BattleFrontier_BattlePalaceLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 7 @@ -186,7 +186,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E399, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePalaceLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -195,7 +195,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D9E6:: @ 824D9E6 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB91 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, 5 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E3C8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePalaceLobby_EventScript_24DB91 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DA87 @@ -233,7 +233,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E408, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePalaceLobby_EventScript_24DBBC warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 @@ -244,11 +244,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3 BattleFrontier_BattlePalaceLobby_EventScript_24DB20:: @ 824DB20 compare VAR_FRONTIER_BATTLE_MODE, 1 goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DE17, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB38:: @ 824DB38 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EBC2, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24D999 BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 @@ -257,11 +257,11 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB45:: @ 824DB45 case 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB6D BattleFrontier_BattlePalaceLobby_EventScript_24DB60:: @ 824DB60 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E173, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB6D:: @ 824DB6D - msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E29E, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DB9C BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A @@ -275,18 +275,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91 special LoadPlayerParty BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, MSGBOX_DEFAULT BattleFrontier_BattlePalaceLobby_EventScript_24DB9C:: @ 824DB9C release end BattleFrontier_BattlePalaceLobby_EventScript_24DB9E:: @ 824DB9E - msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24DD5B, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBA7:: @ 824DBA7 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EB06, MSGBOX_DEFAULT return BattleFrontier_BattlePalaceLobby_EventScript_24DBB0:: @ 824DBB0 @@ -382,24 +382,24 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69 end BattleFrontier_BattlePalaceLobby_EventScript_24DC82:: @ 824DC82 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E6E3, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC8B:: @ 824DC8B - msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E851, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC94:: @ 824DC94 - msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24E992, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DC9D:: @ 824DC9D - msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, 2 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EA4B, MSGBOX_NPC end BattleFrontier_BattlePalaceLobby_EventScript_24DCA6:: @ 824DCA6 lockall - msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EF66, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end @@ -418,27 +418,27 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DCB5:: @ 824DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD13:: @ 824DD13 - msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24EFAB, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD21:: @ 824DD21 - msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F049, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD2F:: @ 824DD2F - msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F190, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD3D:: @ 824DD3D - msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F2E8, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end BattleFrontier_BattlePalaceLobby_EventScript_24DD4B:: @ 824DD4B - msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, 4 + msgbox BattleFrontier_BattlePalaceLobby_Text_24F3F4, MSGBOX_DEFAULT goto BattleFrontier_BattlePalaceLobby_EventScript_24DCB5 end @@ -477,7 +477,7 @@ BattleFrontier_BattlePalaceLobby_Text_24DE17: @ 824DE17 .string "we will present you with Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, you must save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePalaceLobby_Text_24E0D8: @ 824E0D8 @@ -529,7 +529,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E408: @ 824E408 BattleFrontier_BattlePalaceLobby_Text_24E41E: @ 824E41E .string "I feel privileged for having seen\n" - .string "your POKéMON’s exploits.\p" + .string "your POKéMON's exploits.\p" .string "The results will be recorded.\n" .string "I must ask you to briefly wait.$" @@ -578,13 +578,13 @@ BattleFrontier_BattlePalaceLobby_Text_24E6E3: @ 824E6E3 .string "hardy POKéMON are the best.\p" .string "Offense is the best defense!\n" .string "A relentless attack is the ultimate!\p" - .string "But that’s not what I wanted to chat\n" + .string "But that's not what I wanted to chat\n" .string "about.\p" .string "Every so often a really cute lady\n" .string "swings by here.\p" .string "She says that she can tell what\n" .string "POKéMON are thinking.\p" - .string "I don’t know about that part,\n" + .string "I don't know about that part,\n" .string "but she is really cute.\p" .string "Huh?\n" .string "Why are you looking at me like that?$" @@ -594,7 +594,7 @@ BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 .string "It appears that the nature of POKéMON\n" .string "and the moves that they have been\l" .string "taught are the keys to battle here.\p" - .string "To be more precise, it’s how well\n" + .string "To be more precise, it's how well\n" .string "the moves match the nature of\l" .string "the POKéMON.\p" .string "If your POKéMON is in trouble and\n" @@ -604,18 +604,18 @@ BattleFrontier_BattlePalaceLobby_Text_24E851: @ 824E851 BattleFrontier_BattlePalaceLobby_Text_24E992: @ 824E992 .string "My POKéMON is usually very docile.\p" - .string "But when it’s in a BATTLE HALL,\n" + .string "But when it's in a BATTLE HALL,\n" .string "it sometimes seems to become\l" .string "transformed into something wicked!\p" .string "It becomes totally intimidating.\n" - .string "It’s shocking, even.$" + .string "It's shocking, even.$" BattleFrontier_BattlePalaceLobby_Text_24EA4B: @ 824EA4B .string "I wonder what sort of nature a POKéMON\n" .string "would have if it favored enfeebling its\l" .string "opponents and chipping away slowly.\p" - .string "I’d be surprised if it was a LAX nature.\p" - .string "But, nah, that can’t be right.$" + .string "I'd be surprised if it was a LAX nature.\p" + .string "But, nah, that can't be right.$" BattleFrontier_BattlePalaceLobby_Text_24EB06: @ 824EB06 .string "Where the hearts of TRAINERS\n" @@ -648,7 +648,7 @@ BattleFrontier_BattlePalaceLobby_Text_24EBC2: @ 824EBC2 .string "we will present you with Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePalaceLobby_Text_24EE81: @ 824EE81 @@ -722,7 +722,7 @@ VerdanturfTown_BattleTentLobby_Text_24F2E8: @ 824F2E8 BattleFrontier_BattlePalaceLobby_Text_24F3F4: @ 824F3F4 VerdanturfTown_BattleTentLobby_Text_24F3F4: @ 824F3F4 .string "Depending on its nature, a POKéMON may\n" - .string "start using moves that don’t match its\l" + .string "start using moves that don't match its\l" .string "nature when it is in trouble.\p" .string "If a POKéMON begins behaving oddly\n" .string "in a pinch, watch it carefully.$" diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc index 3b2921737..0a0df3636 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc @@ -22,7 +22,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786 applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_25C812 waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, 4 + msgbox BattleFrontier_BattlePikeCorridor_Text_25C817, MSGBOX_DEFAULT closemessage releaseall applymovement 255, BattleFrontier_BattlePikeCorridor_Movement_25C80E diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index 6bdb7f848..e4f3e1a6e 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -29,7 +29,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 setvar VAR_0x8004, 27 special CallBattlePikeFunction lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -53,16 +53,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B762:: @ 825B762 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C18A, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattlePikeLobby_EventScript_25B78D BattleFrontier_BattlePikeLobby_EventScript_25B784:: @ 825B784 - msgbox BattleFrontier_BattlePikeLobby_Text_25C383, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C383, MSGBOX_DEFAULT waitmessage BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D - msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C3D9, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 @@ -87,7 +87,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -116,7 +116,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806 special CallBattlePikeFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -128,7 +128,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868 setvar VAR_FRONTIER_FACILITY, 5 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F message BattleFrontier_BattlePikeLobby_Text_25BBC1 @@ -155,7 +155,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeLobby_Text_25C094, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C094, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePikeLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -164,7 +164,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B8BB:: @ 825B8BB waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA73 - msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, 5 + msgbox BattleFrontier_BattlePikeLobby_Text_25C0D8, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeLobby_EventScript_25BA73 case 1, BattleFrontier_BattlePikeLobby_EventScript_25B95C @@ -205,7 +205,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeLobby_Text_25C130, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C130, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 5 special CallFrontierUtilFunc @@ -218,7 +218,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C end BattleFrontier_BattlePikeLobby_EventScript_25BA1A:: @ 825BA1A - msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BBF5, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25B87F BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 @@ -227,11 +227,11 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA27:: @ 825BA27 case 1, BattleFrontier_BattlePikeLobby_EventScript_25BA4F BattleFrontier_BattlePikeLobby_EventScript_25BA42:: @ 825BA42 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA4F:: @ 825BA4F - msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BF9A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BA7E BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C @@ -245,7 +245,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73 special LoadPlayerParty BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76 - msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, MSGBOX_DEFAULT BattleFrontier_BattlePikeLobby_EventScript_25BA7E:: @ 825BA7E release @@ -277,20 +277,20 @@ BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB - msgbox BattleFrontier_BattlePikeLobby_Text_25C422, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C422, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAB4:: @ 825BAB4 - msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4A5, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BABD:: @ 825BABD - msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, 2 + msgbox BattleFrontier_BattlePikeLobby_Text_25C4FD, MSGBOX_NPC end BattleFrontier_BattlePikeLobby_EventScript_25BAC6:: @ 825BAC6 lockall - msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C5FB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end @@ -307,17 +307,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25BAD5:: @ 825BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB1D:: @ 825BB1D - msgbox BattleFrontier_BattlePikeLobby_Text_25C644, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C644, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB2B:: @ 825BB2B - msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C68A, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end BattleFrontier_BattlePikeLobby_EventScript_25BB39:: @ 825BB39 - msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, 4 + msgbox BattleFrontier_BattlePikeLobby_Text_25C6EB, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeLobby_EventScript_25BAD5 end @@ -352,7 +352,7 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 .string "simple…\p" .string "Choose one of three paths and make\n" .string "your way to the goal room at the end\l" - .string "of the BATTLE PIKE. It’s that simple.\p" + .string "of the BATTLE PIKE. It's that simple.\p" .string "However, what happens on the chosen\n" .string "path depends entirely on the luck\l" .string "of the challenger…\p" @@ -361,7 +361,7 @@ BattleFrontier_BattlePikeLobby_Text_25BBF5: @ 825BBF5 .string "If you want to interrupt your\n" .string "challenge, please have a word with\l" .string "our staff in the big rooms on the way.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePikeLobby_Text_25BE02: @ 825BE02 @@ -452,29 +452,29 @@ BattleFrontier_BattlePikeLobby_Text_25C3D9: @ 825C3D9 BattleFrontier_BattlePikeLobby_Text_25C422: @ 825C422 .string "Arrgh! I blew my chance!\n" .string "I was one room away from the goal!\p" - .string "In this place, you’d better watch out\n" + .string "In this place, you'd better watch out\n" .string "for poison, freezing, and so on.$" BattleFrontier_BattlePikeLobby_Text_25C4A5: @ 825C4A5 - .string "I’ve completed the challenge 10 times\n" - .string "now, but I’ve never had to battle\l" + .string "I've completed the challenge 10 times\n" + .string "now, but I've never had to battle\l" .string "a TRAINER once.$" BattleFrontier_BattlePikeLobby_Text_25C4FD: @ 825C4FD .string "Listen! Listen!\p" - .string "Don’t you think that the special\n" + .string "Don't you think that the special\n" .string "abilities of POKéMON will be useful\l" .string "here?$" BattleFrontier_BattlePikeLobby_Text_25C558: @ 825C558 .string "What is this weird place?\n" - .string "I can’t figure it out at all!\p" - .string "I’ve taken the challenge a bunch\n" + .string "I can't figure it out at all!\p" + .string "I've taken the challenge a bunch\n" .string "of times, but all I ever do is run into\l" .string "TRAINERS whichever path I choose.$" BattleFrontier_BattlePikeLobby_Text_25C5FB: @ 825C5FB - .string "The Battle Choice’s rules are listed.$" + .string "The Battle Choice's rules are listed.$" BattleFrontier_BattlePikeLobby_Text_25C621: @ 825C621 .string "Which heading do you want to read?$" diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 9709e4794..79a10880a 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -30,7 +30,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -58,7 +58,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226:: @ 825D226 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 lockall delay 16 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDFE, MSGBOX_DEFAULT waitmessage closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 @@ -66,7 +66,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage releaseall @@ -86,11 +86,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285:: @ 825D285 waitmovement 0 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE3F, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DE94, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 @@ -110,7 +110,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, MSGBOX_DEFAULT closemessage special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 @@ -147,13 +147,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DED2, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3BD:: @ 825D3BD - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DF71, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA @@ -164,7 +164,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0 @@ -172,7 +172,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D3DA:: @ 825D3DA waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E003, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D @@ -182,13 +182,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416:: @ 825D416 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E02C, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattlePikeRandomRoom1_EventScript_25D443:: @ 825D443 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8, MSGBOX_DEFAULT call BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460 @@ -199,7 +199,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E0F6, MSGBOX_DEFAULT waitmessage playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePikeRandomRoom1_Text_25E118 @@ -207,7 +207,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D460:: @ 825D460 waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E140, MSGBOX_DEFAULT closemessage goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D end @@ -230,19 +230,19 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC:: @ 825D4DC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E15D, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4EA:: @ 825D4EA - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4FC:: @ 825D4FC - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E238, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare goto BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB @@ -258,7 +258,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D50E:: @ 825D50E playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA13, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D798 waitmovement 0 @@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage delay 16 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD @@ -290,7 +290,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE setvar VAR_0x8005, 0 @@ -324,13 +324,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643 compare VAR_0x8004, 1 call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD3F, MSGBOX_DEFAULT closemessage releaseall end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DBE4, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_KIRLIA, 0 @@ -355,7 +355,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_KIRLIA, 0 waitmoncry @@ -363,11 +363,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DC01, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_DUSCLOPS, 0 @@ -388,7 +388,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF, MSGBOX_DEFAULT waitse playmoncry SPECIES_DUSCLOPS, 0 waitmoncry @@ -396,7 +396,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4 waitmovement 0 - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DD06, MSGBOX_DEFAULT return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751:: @ 825D751 @@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B faceplayer setvar VAR_0x8004, 14 special CallBattlePikeFunction - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage release @@ -599,7 +599,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDA3, MSGBOX_DEFAULT closemessage release end @@ -613,7 +613,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E call_if 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875 playfanfare MUS_ME_ASA waitfanfare - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DABE, MSGBOX_DEFAULT closemessage release applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E @@ -623,21 +623,21 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E BattleFrontier_BattlePikeRandomRoom1_EventScript_25D875:: @ 825D875 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DA51, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881:: @ 825D881 lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E32E, MSGBOX_DEFAULT closemessage return BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D lock faceplayer - msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, 4 + msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25DDE6, MSGBOX_DEFAULT closemessage release applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4 @@ -709,8 +709,8 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DA13: @ 825DA13 .string "Battle Choice challenge…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DA51: @ 825DA51 - .string "Ah, you’re a lucky one.\n" - .string "I’m in somewhat-good spirits now.\p" + .string "Ah, you're a lucky one.\n" + .string "I'm in somewhat-good spirits now.\p" .string "I will restore one of your POKéMON\n" .string "to full health.$" @@ -721,7 +721,7 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DABE: @ 825DABE BattleFrontier_BattlePikeRandomRoom1_Text_25DAE1: @ 825DAE1 .string "Excuse me…\p" .string "Would you care for a battle?\n" - .string "I’ll restore your POKéMON if you win.$" + .string "I'll restore your POKéMON if you win.$" BattleFrontier_BattlePikeRandomRoom1_Text_25DB2F: @ 825DB2F .string "Very well…\n" @@ -772,7 +772,7 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DC97: @ 825DC97 BattleFrontier_BattlePikeRandomRoom1_Text_25DCAF: @ 825DCAF .string "Look here!\n" - .string "That’s quite enough!$" + .string "That's quite enough!$" BattleFrontier_BattlePikeRandomRoom1_Text_25DCCF: @ 825DCCF .string "I must apologize to you…\p" @@ -815,12 +815,12 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DED2: @ 825DED2 .string "For I am the PIKE QUEEN…\p" .string "You already know it, but to advance,\n" .string "you must defeat me…\p" - .string "…I’m not one for idle chatter.\n" + .string "…I'm not one for idle chatter.\n" .string "Hurry. Come on…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DF71: @ 825DF71 .string "Your luck…\n" - .string "I hope you didn’t use it all up here…$" + .string "I hope you didn't use it all up here…$" BattleFrontier_BattlePikeRandomRoom1_Text_25DFA2: @ 825DFA2 .string "LUCY: … … … … … …\n" @@ -831,18 +831,18 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25DFD0: @ 825DFD0 .string "the FRONTIER PASS!$" BattleFrontier_BattlePikeRandomRoom1_Text_25E003: @ 825E003 - .string "…That’s all there is…\n" + .string "…That's all there is…\n" .string "Disappear already…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E02C: @ 825E02C .string "LUCY: …You again…\p" .string "… … … … … …\p" - .string "…I’ve trampled flowers and braved\n" + .string "…I've trampled flowers and braved\n" .string "storms to get to where I am…\p" - .string "I don’t feel any compulsion to keep\n" + .string "I don't feel any compulsion to keep\n" .string "losing to the same opponent…\p" .string "… … … … … …\n" - .string "Fine… I’ll do it…$" + .string "Fine… I'll do it…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E0E8: @ 825E0E8 .string "Now!\n" @@ -857,14 +857,14 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25E118: @ 825E118 .string "a golden shine!$" BattleFrontier_BattlePikeRandomRoom1_Text_25E140: @ 825E140 - .string "…You, I won’t forget…\n" + .string "…You, I won't forget…\n" .string "…Ever…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E15D: @ 825E15D .string "I welcome you…\p" .string "Giggle…\n" .string "You seem to be bereft of luck…\p" - .string "If only you hadn’t chosen this room,\n" + .string "If only you hadn't chosen this room,\n" .string "your POKéMON could have been healed…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E1DD: @ 825E1DD @@ -888,8 +888,8 @@ BattleFrontier_BattlePikeRandomRoom1_Text_25E311: @ 825E311 .string "I shall go fetch our master…$" BattleFrontier_BattlePikeRandomRoom1_Text_25E32E: @ 825E32E - .string "Ah, you’re a lucky one!\n" - .string "I’m in good spirits now.\p" + .string "Ah, you're a lucky one!\n" + .string "I'm in good spirits now.\p" .string "I will restore two of your POKéMON\n" .string "to full health!$" diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc index 58031dd85..83031af95 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc @@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 setvar VAR_0x8006, 3 special CallFrontierUtilFunc lockall - msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, 4 + msgbox BattleFrontier_BattlePikeRandomRoom2_Text_25E3F2, MSGBOX_DEFAULT closemessage releaseall warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index 0ff9ff5db..ab40b6ff0 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -49,7 +49,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CDDA, MSGBOX_DEFAULT closemessage releaseall setvar VAR_0x8004, 5 @@ -77,54 +77,54 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908:: @ 825C908 BattleFrontier_BattlePikeThreePathRoom_EventScript_25C968:: @ 825C968 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C978:: @ 825C978 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC00, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C988:: @ 825C988 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C998:: @ 825C998 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC46, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9A8:: @ 825C9A8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC69, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9B8:: @ 825C9B8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CC8C, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9C8:: @ 825C9C8 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCB0, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9D8:: @ 825C9D8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCD4, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A case 127, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A @@ -148,7 +148,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA2A:: @ 825CA2A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CCFB, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A @@ -181,7 +181,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97 applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE waitmovement 0 lockall - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D094, MSGBOX_DEFAULT releaseall applymovement 2, BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5 waitmovement 0 @@ -195,7 +195,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB goto_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, 5 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CE69, MSGBOX_YESNO switch VAR_RESULT case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00 @@ -204,7 +204,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEBB, MSGBOX_DEFAULT release end @@ -218,15 +218,15 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39:: @ 825CB39 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF64, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB46:: @ 825CB46 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CF23, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CEE3, MSGBOX_DEFAULT goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 @@ -240,29 +240,29 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A:: @ 825CB9A - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D054, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBA4:: @ 825CBA4 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D017, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBAE:: @ 825CBAE - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFA3, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBB8:: @ 825CBB8 - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25CFE5, MSGBOX_DEFAULT release end BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 lock faceplayer - msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, 4 + msgbox BattleFrontier_BattlePikeThreePathRoom_Text_25D125, MSGBOX_DEFAULT release end @@ -326,7 +326,7 @@ BattleFrontier_BattlePikeThreePathRoom_Text_25CD3C: @ 825CD3C .string "Battle Choice challenge?$" BattleFrontier_BattlePikeThreePathRoom_Text_25CD75: @ 825CD75 - .string "We’ve been awaiting your return…\p" + .string "We've been awaiting your return…\p" .string "Before resuming your Battle Choice\n" .string "challenge, let me save the game…$" diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc index 5bb6a87e0..91a42ebde 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc @@ -2,12 +2,12 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapScripts:: @ 825F070 .byte 0 BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F071:: @ 825F071 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA, MSGBOX_DEFAULT special sub_813A958 return BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F07D:: @ 825F07D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12, MSGBOX_DEFAULT special sub_813A988 release end @@ -16,7 +16,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F08A:: @ 825F08A specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0C9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 compare VAR_TEMP_2, 1 @@ -43,14 +43,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F0E5:: @ 825F0E5 givedecoration VAR_0x8009 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45, MSGBOX_DEFAULT compare VAR_TEMP_2, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F11D:: @ 825F11D - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9, MSGBOX_DEFAULT special sub_813A988 release end @@ -64,14 +64,14 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F12A:: @ 825F12A giveitem VAR_0x8009, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72, MSGBOX_DEFAULT compare VAR_TEMP_2, 2 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 goto BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F166:: @ 825F166 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3, MSGBOX_DEFAULT special sub_813A988 release end @@ -106,7 +106,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185:: @ 825F185 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 16 @@ -115,7 +115,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F21E:: @ 825F21E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -124,7 +124,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F241:: @ 825F241 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 32 @@ -133,7 +133,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F264:: @ 825F264 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -142,7 +142,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F287:: @ 825F287 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -151,7 +151,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2AA:: @ 825F2AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -160,7 +160,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2CD:: @ 825F2CD end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 48 @@ -169,7 +169,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F2F0:: @ 825F2F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -178,7 +178,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F313:: @ 825F313 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -187,7 +187,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F336:: @ 825F336 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F359:: @ 825F359 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F185 setvar VAR_0x8008, 80 @@ -220,7 +220,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E:: @ 825F38E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -229,7 +229,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F3F0:: @ 825F3F0 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 128 @@ -238,7 +238,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F413:: @ 825F413 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -247,7 +247,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F436:: @ 825F436 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -256,7 +256,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F459:: @ 825F459 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F47C:: @ 825F47C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F38E setvar VAR_0x8008, 256 @@ -290,7 +290,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1:: @ 825F4B1 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -299,7 +299,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F51E:: @ 825F51E end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -308,7 +308,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F541:: @ 825F541 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -317,7 +317,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F564:: @ 825F564 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -326,7 +326,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F587:: @ 825F587 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -335,7 +335,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5AA:: @ 825F5AA end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5CD:: @ 825F5CD - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F4B1 setvar VAR_0x8008, 1 @@ -372,7 +372,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602:: @ 825F602 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -381,7 +381,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F690:: @ 825F690 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -390,7 +390,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6B3:: @ 825F6B3 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -399,7 +399,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6D6:: @ 825F6D6 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 48 @@ -408,7 +408,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F6F9:: @ 825F6F9 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -417,7 +417,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F71C:: @ 825F71C end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -426,7 +426,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F73F:: @ 825F73F end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -435,7 +435,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F762:: @ 825F762 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -444,7 +444,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F785:: @ 825F785 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, 5 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F602 setvar VAR_0x8008, 64 @@ -453,25 +453,25 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7A8:: @ 825F7A8 end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB:: @ 825F7CB - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_260099, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4:: @ 825F7D4 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD:: @ 825F7DD lock - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, 4 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0, MSGBOX_DEFAULT release end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8:: @ 825F7E8 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1:: @ 825F7F1 - msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, 2 + msgbox BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D, MSGBOX_NPC end BattleFrontier_BattlePointExchangeServiceCorner_Text_25F7FA: @ 825F7FA @@ -485,143 +485,143 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25F890: @ 825F890 .string "Please choose a prize from this list.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8B6: @ 825F8B6 - .string "You’ve chosen the KISS POSTER.\n" + .string "You've chosen the KISS POSTER.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F8E6: @ 825F8E6 - .string "You’ve chosen the KISS CUSHION.\n" + .string "You've chosen the KISS CUSHION.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F917: @ 825F917 - .string "You’ve chosen the SMOOCHUM DOLL.\n" + .string "You've chosen the SMOOCHUM DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F949: @ 825F949 - .string "You’ve chosen the TOGEPI DOLL.\n" + .string "You've chosen the TOGEPI DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F979: @ 825F979 - .string "You’ve chosen the MEOWTH DOLL.\n" + .string "You've chosen the MEOWTH DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9A9: @ 825F9A9 - .string "You’ve chosen the CLEFAIRY DOLL.\n" + .string "You've chosen the CLEFAIRY DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25F9DB: @ 825F9DB - .string "You’ve chosen the DITTO DOLL.\n" + .string "You've chosen the DITTO DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA0A: @ 825FA0A - .string "You’ve chosen the CYNDAQUIL DOLL.\n" + .string "You've chosen the CYNDAQUIL DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA3D: @ 825FA3D - .string "You’ve chosen the CHIKORITA DOLL.\n" + .string "You've chosen the CHIKORITA DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FA70: @ 825FA70 - .string "You’ve chosen the TOTODILE DOLL.\n" + .string "You've chosen the TOTODILE DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAA2: @ 825FAA2 - .string "You’ve chosen the LAPRAS DOLL.\n" + .string "You've chosen the LAPRAS DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FAD2: @ 825FAD2 - .string "You’ve chosen the SNORLAX DOLL.\n" + .string "You've chosen the SNORLAX DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB03: @ 825FB03 - .string "You’ve chosen the VENUSAUR DOLL.\n" + .string "You've chosen the VENUSAUR DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB35: @ 825FB35 - .string "You’ve chosen the CHARIZARD DOLL.\n" + .string "You've chosen the CHARIZARD DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB68: @ 825FB68 - .string "You’ve chosen the BLASTOISE DOLL.\n" + .string "You've chosen the BLASTOISE DOLL.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FB9B: @ 825FB9B - .string "You’ve chosen the PROTEIN.\n" + .string "You've chosen the PROTEIN.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBC7: @ 825FBC7 - .string "You’ve chosen the CALCIUM.\n" + .string "You've chosen the CALCIUM.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FBF3: @ 825FBF3 - .string "You’ve chosen the IRON.\n" + .string "You've chosen the IRON.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC1C: @ 825FC1C - .string "You’ve chosen the ZINC.\n" + .string "You've chosen the ZINC.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC45: @ 825FC45 - .string "You’ve chosen the CARBOS.\n" + .string "You've chosen the CARBOS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC70: @ 825FC70 - .string "You’ve chosen the HP UP.\n" + .string "You've chosen the HP UP.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FC9A: @ 825FC9A - .string "You’ve chosen the BRIGHTPOWDER.\n" + .string "You've chosen the BRIGHTPOWDER.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCCB: @ 825FCCB - .string "You’ve chosen the WHITE HERB.\n" + .string "You've chosen the WHITE HERB.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FCFA: @ 825FCFA - .string "You’ve chosen the QUICK CLAW.\n" + .string "You've chosen the QUICK CLAW.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD29: @ 825FD29 - .string "You’ve chosen the MENTAL HERB.\n" + .string "You've chosen the MENTAL HERB.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD59: @ 825FD59 - .string "You’ve chosen the CHOICE BAND.\n" + .string "You've chosen the CHOICE BAND.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FD89: @ 825FD89 - .string "You’ve chosen the KING’S ROCK.\n" + .string "You've chosen the KING'S ROCK.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDB9: @ 825FDB9 - .string "You’ve chosen the FOCUS BAND.\n" + .string "You've chosen the FOCUS BAND.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FDE8: @ 825FDE8 - .string "You’ve chosen the SCOPE LENS.\n" + .string "You've chosen the SCOPE LENS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE17: @ 825FE17 - .string "You’ve chosen the LEFTOVERS.\n" + .string "You've chosen the LEFTOVERS.\n" .string "Is that correct?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE45: @ 825FE45 .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" + .string "We'll send it to your PC at home.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE72: @ 825FE72 .string "Here is your prize!$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FE86: @ 825FE86 - .string "I’m so sorry…\n" - .string "You don’t have enough Battle Points…$" + .string "I'm so sorry…\n" + .string "You don't have enough Battle Points…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEB9: @ 825FEB9 - .string "I’m so sorry…\n" + .string "I'm so sorry…\n" .string "Your PC appears to be full…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FEE3: @ 825FEE3 - .string "I’m so sorry…\n" - .string "You don’t have space to hold it…$" + .string "I'm so sorry…\n" + .string "You don't have space to hold it…$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 .string "Thank you very much.\p" @@ -629,7 +629,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF12: @ 825FF12 .string "saved up Battle Points.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D - .string "Oh, they’re so nice!\n" + .string "Oh, they're so nice!\n" .string "I wish I had them!\l" .string "Cute cushions!\l" .string "Big plush DOLLS!\l" @@ -638,7 +638,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_25FF5D: @ 825FF5D BattleFrontier_BattlePointExchangeServiceCorner_Text_25FFD0: @ 825FFD0 .string "Leave it to your mommy!\p" - .string "If it’s anything you want, I’ll go\n" + .string "If it's anything you want, I'll go\n" .string "through anything to get it, honey!$" BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E @@ -650,10 +650,10 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_26002E: @ 826002E BattleFrontier_BattlePointExchangeServiceCorner_Text_260099: @ 8260099 .string "Hah?\n" .string "What are you gawking at?\p" - .string "I don’t like you staring at my plush\n" + .string "I don't like you staring at my plush\n" .string "doll like that.\p" .string "If you want it, go get one yourself!\n" - .string "Isn’t that right, SMOOCHUM?$" + .string "Isn't that right, SMOOCHUM?$" BattleFrontier_BattlePointExchangeServiceCorner_Text_26012D: @ 826012D .string "Did you know?\p" @@ -748,7 +748,7 @@ BattleFrontier_BattlePointExchangeServiceCorner_Text_260542:: @ 8260542 .string "reduce accuracy.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_260575:: @ 8260575 - .string "Raises a move’s power, but permits\n" + .string "Raises a move's power, but permits\n" .string "only that move.$" BattleFrontier_BattlePointExchangeServiceCorner_Text_2605A8:: @ 82605A8 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc index facd60979..d6d53bc2f 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc @@ -153,7 +153,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F - trainerbattle 9, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D + trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 10 special CallBattlePyramidFunction waitmessage @@ -165,7 +165,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F:: @ 8252C4F BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A:: @ 8252C6A setvar VAR_0x8004, 7 special CallBattlePyramidFunction - callstd 1 + callstd STD_FIND_ITEM compare VAR_0x8007, 0 goto_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C87 setvar VAR_0x8004, 8 @@ -190,19 +190,19 @@ gText_BattlePyramidConfirmRetire:: @ 8252CFB .string "PYRAMID quest?$" BattleFrontier_BattlePyramidEmptySquare_Text_252D2D:: @ 8252D2D - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {UP_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252D57:: @ 8252D57 - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {LEFT_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252D81:: @ 8252D81 - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {RIGHT_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252DAB:: @ 8252DAB - .string "This floor’s exit is in\n" + .string "This floor's exit is in\n" .string "that direction: {DOWN_ARROW}$" BattleFrontier_BattlePyramidEmptySquare_Text_252DD5:: @ 8252DD5 @@ -255,19 +255,19 @@ BattleFrontier_BattlePyramidEmptySquare_Text_252FAC:: @ 8252FAC BattleFrontier_BattlePyramidEmptySquare_Text_252FE5:: @ 8252FE5 .string "The exit?\n" - .string "It’s that {UP_ARROW} way.$" + .string "It's that {UP_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253000:: @ 8253000 .string "The exit?\n" - .string "It’s that {LEFT_ARROW} way.$" + .string "It's that {LEFT_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_25301B:: @ 825301B .string "The exit?\n" - .string "It’s that {RIGHT_ARROW} way.$" + .string "It's that {RIGHT_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253036:: @ 8253036 .string "The exit?\n" - .string "It’s that {DOWN_ARROW} way.$" + .string "It's that {DOWN_ARROW} way.$" BattleFrontier_BattlePyramidEmptySquare_Text_253051:: @ 8253051 .string "The exit happens to be in\n" @@ -327,159 +327,159 @@ BattleFrontier_BattlePyramidEmptySquare_Text_2532CC:: @ 82532CC BattleFrontier_BattlePyramidEmptySquare_Text_25330B:: @ 825330B .string "Are you looking for items?\p" - .string "There isn’t anything left to\n" + .string "There isn't anything left to\n" .string "be found!$" BattleFrontier_BattlePyramidEmptySquare_Text_25334D:: @ 825334D - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are eight items\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2533A6:: @ 82533A6 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are seven items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253404:: @ 8253404 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are six items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253460:: @ 8253460 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are five items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2534BD:: @ 82534BD - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are four items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25351A:: @ 825351A - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are three items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_253578:: @ 8253578 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There are two items left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_2535D4:: @ 82535D4 - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" .string "There is just one item\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25362E:: @ 825362E - .string "Because you won, I’ll tell you\n" + .string "Because you won, I'll tell you\n" .string "a little secret!\p" - .string "There isn’t anything left\n" + .string "There isn't anything left\n" .string "lying around here.$" BattleFrontier_BattlePyramidEmptySquare_Text_25368B:: @ 825368B - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are eight items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2536F8:: @ 82536F8 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are seven items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253765:: @ 8253765 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are six items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2537D0:: @ 82537D0 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are five items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_25383C:: @ 825383C - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are four items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2538A8:: @ 82538A8 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are three items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253915:: @ 8253915 - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are two items left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_253980:: @ 8253980 - .string "How’s your stock of items holding up?\p" - .string "I reckon there’s but one item left\n" + .string "How's your stock of items holding up?\p" + .string "I reckon there's but one item left\n" .string "waiting to be found on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_2539EC:: @ 82539EC - .string "How’s your stock of items holding up?\p" + .string "How's your stock of items holding up?\p" .string "I reckon there are no more items\n" .string "waiting to be found on this floor.\l" .string "You take care now!$" BattleFrontier_BattlePyramidEmptySquare_Text_253A69:: @ 8253A69 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be eight more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253AC4:: @ 8253AC4 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be seven more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253B1F:: @ 8253B1F - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be six more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253B78:: @ 8253B78 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be five more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253BD2:: @ 8253BD2 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be four more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253C2C:: @ 8253C2C - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be three more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253C87:: @ 8253C87 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be two more\n" .string "items on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253CE0:: @ 8253CE0 - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appears to be only one more\n" .string "item on the ground.$" BattleFrontier_BattlePyramidEmptySquare_Text_253D3E:: @ 8253D3E - .string "You’re strong, so you’ve earned\n" + .string "You're strong, so you've earned\n" .string "a hint!\p" .string "There appear to be no more\n" .string "items on the ground.$" @@ -597,12 +597,12 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25440B:: @ 825440B BattleFrontier_BattlePyramidEmptySquare_Text_25445A:: @ 825445A .string "You were really awesome!\p" - .string "But there’s still one tough\n" + .string "But there's still one tough\n" .string "TRAINER other than me!$" BattleFrontier_BattlePyramidEmptySquare_Text_2544A6:: @ 82544A6 .string "You were really awesome!\p" - .string "There’s no one left that\n" + .string "There's no one left that\n" .string "can beat you!$" BattleFrontier_BattlePyramidEmptySquare_Text_2544E6:: @ 82544E6 @@ -637,8 +637,8 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25467C:: @ 825467C BattleFrontier_BattlePyramidEmptySquare_Text_2546CC:: @ 82546CC .string "This is so upsetting!\p" - .string "But there’s one TRAINER left!\n" - .string "I’m sure you will be humbled!$" + .string "But there's one TRAINER left!\n" + .string "I'm sure you will be humbled!$" BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E .string "This is so upsetting!\p" @@ -646,43 +646,43 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25471E:: @ 825471E .string "who can engage you!$" BattleFrontier_BattlePyramidEmptySquare_Text_254767:: @ 8254767 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are seven more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_2547C9:: @ 82547C9 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are six more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_254829:: @ 8254829 - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are five more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_25488A:: @ 825488A - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are four more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_2548EB:: @ 82548EB - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are three more TRAINERS\n" .string "on this floor. Can you beat them all?$" BattleFrontier_BattlePyramidEmptySquare_Text_25494D:: @ 825494D - .string "That’s pretty impressive!\p" + .string "That's pretty impressive!\p" .string "But there are two more TRAINERS\n" .string "on this floor. Can you beat them both?$" BattleFrontier_BattlePyramidEmptySquare_Text_2549AE:: @ 82549AE - .string "That’s pretty impressive!\p" - .string "But there’s still one more TRAINER\n" + .string "That's pretty impressive!\p" + .string "But there's still one more TRAINER\n" .string "on this floor. Can you prevail?$" BattleFrontier_BattlePyramidEmptySquare_Text_254A0B:: @ 8254A0B - .string "That’s pretty impressive!\p" - .string "You’ve gone through all the TRAINERS\n" + .string "That's pretty impressive!\p" + .string "You've gone through all the TRAINERS\n" .string "on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_254A59:: @ 8254A59 @@ -714,7 +714,7 @@ BattleFrontier_BattlePyramidEmptySquare_Text_254BF1:: @ 8254BF1 .string "with the one TRAINER left on this floor.$" BattleFrontier_BattlePyramidEmptySquare_Text_254C3E:: @ 8254C3E - .string "There isn’t a single person left who\n" + .string "There isn't a single person left who\n" .string "can defeat you now…$" BattleFrontier_BattlePyramidEmptySquare_Text_254C77:: @ 8254C77 @@ -779,6 +779,5 @@ BattleFrontier_BattlePyramidEmptySquare_Text_25502F:: @ 825502F .string "the last remaining TRAINER?$" BattleFrontier_BattlePyramidEmptySquare_Text_255068:: @ 8255068 - .string "There aren’t any TRAINERS left that\n" + .string "There aren't any TRAINERS left that\n" .string "can take you on now…$" - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index bcd2e32c9..d890b2d06 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -54,11 +54,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507B1:: @ 82507B1 special CallFrontierUtilFunc compare VAR_RESULT, 1 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_2507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517B5, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2507DA BattleFrontier_BattlePyramidLobby_EventScript_2507D2:: @ 82507D2 - msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2525F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special sub_81B95E0 @@ -75,7 +75,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_252662, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252662, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 @@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -117,7 +117,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852 special CallBattlePyramidFunction playse SE_SAVE waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251BB6, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -132,7 +132,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1 setvar VAR_FRONTIER_FACILITY, 6 setvar VAR_FRONTIER_BATTLE_MODE, 0 special SavePlayerParty - msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8 message BattleFrontier_BattlePyramidLobby_Text_250FA7 @@ -159,7 +159,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidLobby_Text_251297, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251297, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattlePyramidLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -168,7 +168,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250904:: @ 8250904 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AC1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, 5 + msgbox BattleFrontier_BattlePyramidLobby_Text_2514E6, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattlePyramidLobby_EventScript_250AC1 case 1, BattleFrontier_BattlePyramidLobby_EventScript_2509A5 @@ -210,7 +210,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidLobby_Text_251531, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251531, MSGBOX_DEFAULT closemessage call BattleFrontier_BattlePyramidLobby_EventScript_250D56 setvar VAR_0x8004, 2 @@ -225,7 +225,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21 end BattleFrontier_BattlePyramidLobby_EventScript_250A68:: @ 8250A68 - msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25100C, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_2508C8 BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 @@ -234,11 +234,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250A75:: @ 8250A75 case 1, BattleFrontier_BattlePyramidLobby_EventScript_250A9D BattleFrontier_BattlePyramidLobby_EventScript_250A90:: @ 8250A90 - msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2513C1, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250A9D:: @ 8250A9D - msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2512E2, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250ACC BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA @@ -252,7 +252,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1 special LoadPlayerParty BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC release @@ -262,9 +262,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 - msgbox BattleFrontier_BattlePyramidLobby_Text_252461, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252461, MSGBOX_DEFAULT releaseall end @@ -281,7 +281,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27 return BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special CallBattlePyramidFunction @@ -299,7 +299,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 return BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 - msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 6 special CallBattlePyramidFunction @@ -343,83 +343,83 @@ BattleFrontier_BattlePyramidLobby_EventScript_250BA4:: @ 8250BA4 return BattleFrontier_BattlePyramidLobby_EventScript_250C8E:: @ 8250C8E - msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251CB3, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250C97:: @ 8250C97 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D07, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA0:: @ 8250CA0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D54, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CA9:: @ 8250CA9 - msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251D9C, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CB2:: @ 8250CB2 - msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251E3D, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CBB:: @ 8250CBB - msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251EA1, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CC4:: @ 8250CC4 - msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F17, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CCD:: @ 8250CCD - msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251F6E, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CD6:: @ 8250CD6 - msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251FC7, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CDF:: @ 8250CDF - msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25201B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CE8:: @ 8250CE8 - msgbox BattleFrontier_BattlePyramidLobby_Text_252068, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252068, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CF1:: @ 8250CF1 - msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2520BA, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250CFA:: @ 8250CFA - msgbox BattleFrontier_BattlePyramidLobby_Text_252158, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252158, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D03:: @ 8250D03 - msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2521B4, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D0C:: @ 8250D0C - msgbox BattleFrontier_BattlePyramidLobby_Text_252206, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252206, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D15:: @ 8250D15 - msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25225A, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D1E:: @ 8250D1E - msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2522AE, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D27:: @ 8250D27 - msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25230B, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D30:: @ 8250D30 - msgbox BattleFrontier_BattlePyramidLobby_Text_252364, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252364, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D39:: @ 8250D39 - msgbox BattleFrontier_BattlePyramidLobby_Text_252403, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252403, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42 @@ -436,24 +436,24 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56 applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DC4 applymovement 255, BattleFrontier_BattlePyramidLobby_Movement_250DCD waitmovement 0 - msgbox BattleFrontier_BattlePyramidLobby_Text_251569, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special CallBattlePyramidFunction compare VAR_RESULT, 0 goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515AD, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250D9C BattleFrontier_BattlePyramidLobby_EventScript_250D94:: @ 8250D94 - msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2515F4, MSGBOX_DEFAULT BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C message BattleFrontier_BattlePyramidLobby_Text_25161E waitmessage playse SE_EXPMAX waitse - msgbox BattleFrontier_BattlePyramidLobby_Text_251647, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251647, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_250DD5 waitmovement 0 @@ -493,7 +493,7 @@ BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB - msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2517FC, MSGBOX_DEFAULT setflag FLAG_SPECIAL_FLAG_0x4004 special sub_81C6A94 compare VAR_RESULT, 0 @@ -504,7 +504,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB end BattleFrontier_BattlePyramidLobby_EventScript_250E00:: @ 8250E00 - msgbox BattleFrontier_BattlePyramidLobby_Text_251881, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_251881, MSGBOX_DEFAULT return BattleFrontier_BattlePyramidLobby_EventScript_250E09:: @ 8250E09 @@ -539,23 +539,23 @@ BattleFrontier_BattlePyramidLobby_EventScript_250E60:: @ 8250E60 return BattleFrontier_BattlePyramidLobby_EventScript_250E6F:: @ 8250E6F - msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25194F, MSGBOX_DEFAULT message BattleFrontier_BattlePyramidLobby_Text_25197E waitmessage goto BattleFrontier_BattlePyramidLobby_EventScript_250E09 end BattleFrontier_BattlePyramidLobby_EventScript_250E83:: @ 8250E83 - msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_2524DA, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E8C:: @ 8250E8C - msgbox BattleFrontier_BattlePyramidLobby_Text_252595, 2 + msgbox BattleFrontier_BattlePyramidLobby_Text_252595, MSGBOX_NPC end BattleFrontier_BattlePyramidLobby_EventScript_250E95:: @ 8250E95 lockall - msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526B6, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end @@ -573,22 +573,22 @@ BattleFrontier_BattlePyramidLobby_EventScript_250EA4:: @ 8250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250EF7:: @ 8250EF7 - msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2526FC, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F05:: @ 8250F05 - msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_2527A9, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F13:: @ 8250F13 - msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_25285A, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end BattleFrontier_BattlePyramidLobby_EventScript_250F21:: @ 8250F21 - msgbox BattleFrontier_BattlePyramidLobby_Text_252924, 4 + msgbox BattleFrontier_BattlePyramidLobby_Text_252924, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidLobby_EventScript_250EA4 end @@ -626,7 +626,7 @@ BattleFrontier_BattlePyramidLobby_Text_25100C: @ 825100C .string "If you want to interrupt your\n" .string "challenge, you must select “REST”\l" .string "and save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattlePyramidLobby_Text_251248: @ 8251248 @@ -696,21 +696,21 @@ BattleFrontier_BattlePyramidLobby_Text_2516D6: @ 82516D6 .string "You did not save before ending\n" .string "your challenge the last time.\p" .string "Consequently, your challenge has\n" - .string "been disqualified, I’m sorry to say.\p" - .string "Here is the BAG we’ve been holding\n" + .string "been disqualified, I'm sorry to say.\p" + .string "Here is the BAG we've been holding\n" .string "for you.\p" .string "{PLAYER} got the BAG back.$" BattleFrontier_BattlePyramidLobby_Text_2517B5: @ 82517B5 .string "Excellent to see you back!\p" - .string "You’ve conquered the PYRAMID!\n" + .string "You've conquered the PYRAMID!\n" .string "How splendid!$" BattleFrontier_BattlePyramidLobby_Text_2517FC: @ 82517FC .string "Ah, a slight problem.\p" .string "At least one POKéMON is holding\n" .string "an item.\p" - .string "I’m sorry to say, items obtained in\n" + .string "I'm sorry to say, items obtained in\n" .string "the PYRAMID cannot be taken away.$" BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 @@ -719,8 +719,8 @@ BattleFrontier_BattlePyramidLobby_Text_251881: @ 8251881 BattleFrontier_BattlePyramidLobby_Text_2518C6: @ 82518C6 .string "The BATTLE BAG cannot hold all your\n" - .string "items, I’m sorry to say.\p" - .string "Please pick the items you’ll keep in the\n" + .string "items, I'm sorry to say.\p" + .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F @@ -728,7 +728,7 @@ BattleFrontier_BattlePyramidLobby_Text_25194F: @ 825194F .string "holding an item.$" BattleFrontier_BattlePyramidLobby_Text_25197E: @ 825197E - .string "Please pick the items you’ll keep in the\n" + .string "Please pick the items you'll keep in the\n" .string "BATTLE BAG, and with your POKéMON.$" BattleFrontier_BattlePyramidLobby_Text_2519CA: @ 82519CA @@ -739,7 +739,7 @@ BattleFrontier_BattlePyramidLobby_Text_2519F8: @ 82519F8 .string "The BATTLE BAG you used will be kept\n" .string "in readiness for your next challenge.\p" .string "{PLAYER} turned the BATTLE BAG over\n" - .string "for the BAG’s return.$" + .string "for the BAG's return.$" BattleFrontier_BattlePyramidLobby_Text_251A77: @ 8251A77 .string "I must record your results.\n" @@ -756,12 +756,12 @@ BattleFrontier_BattlePyramidLobby_Text_251AE2: @ 8251AE2 BattleFrontier_BattlePyramidLobby_Text_251AFC: @ 8251AFC .string "…Ah…\n" .string "Your BAG appears to be filled.\p" - .string "Please return after you’ve organized\n" - .string "your BAG’s contents.$" + .string "Please return after you've organized\n" + .string "your BAG's contents.$" BattleFrontier_BattlePyramidLobby_Text_251B5A: @ 8251B5A .string "How disappointing for you…\p" - .string "Here is the BAG we’ve been holding\n" + .string "Here is the BAG we've been holding\n" .string "for you.\p" .string "{PLAYER} got the BAG back.$" @@ -818,7 +818,7 @@ BattleFrontier_BattlePyramidLobby_Text_251EA1: @ 8251EA1 .string "I sense terrific energy rising from\n" .string "the ground below…\p" .string "…And, I see your POKéMON unable to\n" - .string "escape the power’s clutches…$" + .string "escape the power's clutches…$" BattleFrontier_BattlePyramidLobby_Text_251F17: @ 8251F17 .string "I see ICE-type POKéMON…\p" @@ -908,7 +908,7 @@ BattleFrontier_BattlePyramidLobby_Text_2524DA: @ 82524DA .string "If you run fast, TRAINERS may notice\n" .string "and come after you for a battle.\p" .string "So, if you want to avoid TRAINERS,\n" - .string "don’t catch their eyes, but sneak\l" + .string "don't catch their eyes, but sneak\l" .string "cautiously and quietly past them.$" BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 @@ -919,8 +919,8 @@ BattleFrontier_BattlePyramidLobby_Text_252595: @ 8252595 BattleFrontier_BattlePyramidLobby_Text_2525F4: @ 82525F4 .string "Welcome back!\n" - .string "You’ve done the unthinkable!\p" - .string "You’ve defeated the PYRAMID KING\n" + .string "You've done the unthinkable!\p" + .string "You've defeated the PYRAMID KING\n" .string "and conquered the BATTLE PYRAMID!$" BattleFrontier_BattlePyramidLobby_Text_252662: @ 8252662 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index e77013519..d7a1a3c3b 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -92,7 +92,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2551D0:: @ 82551D0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255236 compare VAR_TEMP_C, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255240 - msgbox BattleFrontier_BattlePyramidTop_Text_255410, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255410, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD waitmovement 0 @@ -116,12 +116,12 @@ BattleFrontier_BattlePyramidTop_EventScript_25521A:: @ 825521A end BattleFrontier_BattlePyramidTop_EventScript_255236:: @ 8255236 - msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255BFE, MSGBOX_DEFAULT closemessage end BattleFrontier_BattlePyramidTop_EventScript_255240:: @ 8255240 - msgbox BattleFrontier_BattlePyramidTop_Text_25551F, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25551F, MSGBOX_DEFAULT applymovement 1, BattleFrontier_BattlePyramidTop_Movement_2553FD setvar VAR_TEMP_D, 1 closemessage @@ -141,14 +141,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255669, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_25573E, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25573E, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_2552DA end @@ -157,7 +157,7 @@ BattleFrontier_BattlePyramidTop_EventScript_2552D0:: @ 82552D0 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_2552DA:: @ 82552DA - msgbox BattleFrontier_BattlePyramidTop_Text_255846, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255846, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -169,14 +169,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2552FB:: @ 82552FB special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255873, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255873, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_2558E9 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidTop_Text_25591D, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_25591D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 @@ -188,14 +188,14 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255951, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc applymovement 2, BattleFrontier_BattlePyramidTop_Movement_25540A waitmovement 0 - msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255A6D, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_255392 end @@ -204,7 +204,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255388:: @ 8255388 waitmovement 0 BattleFrontier_BattlePyramidTop_EventScript_255392:: @ 8255392 - msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255AA1, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidTop_EventScript_2553ED playbgm MUS_PYRAMID_TOP, 0 compare VAR_RESULT, 1 @@ -216,14 +216,14 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePyramidTop_EventScript_25521A - msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255ACD, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattlePyramidTop_Text_255B59 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattlePyramidTop_Text_255B82, 4 + msgbox BattleFrontier_BattlePyramidTop_Text_255B82, MSGBOX_DEFAULT goto BattleFrontier_BattlePyramidTop_EventScript_25521A BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED @@ -267,7 +267,7 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 .string "It is a delight to see you here!\n" .string "You have reached the summit of\l" .string "the BATTLE PYRAMID!\p" - .string "Above here is the PYRAMID’s\n" + .string "Above here is the PYRAMID's\n" .string "lookout point.\p" .string "It is a place open only to those\n" .string "who have conquered the PYRAMID.\p" @@ -275,7 +275,7 @@ BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 .string "Up you go!$" BattleFrontier_BattlePyramidTop_Text_2554E8: @ 82554E8 - .string "The PYRAMID’s new conqueror!\n" + .string "The PYRAMID's new conqueror!\n" .string "Let the name {PLAYER} be known!$" BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F @@ -293,7 +293,7 @@ BattleFrontier_BattlePyramidTop_Text_25551F: @ 825551F BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 .string "Young adventurer…\p" - .string "Wouldn’t you agree that explorations\n" + .string "Wouldn't you agree that explorations\n" .string "are the grandest of adventures?\p" .string "Your own wits!\p" .string "Your own strength!\p" @@ -304,9 +304,9 @@ BattleFrontier_BattlePyramidTop_Text_255669: @ 8255669 BattleFrontier_BattlePyramidTop_Text_25573E: @ 825573E .string "Aah, yes, indeed this life is grand!\n" .string "Grand, it is! Eh?\p" - .string "I’m BRANDON!\p" - .string "I’m the PYRAMID KING, which means\n" - .string "I’m in charge here.\p" + .string "I'm BRANDON!\p" + .string "I'm the PYRAMID KING, which means\n" + .string "I'm in charge here.\p" .string "Most people call me the chief!\p" .string "You coming here means you have\n" .string "that much confidence in yourself,\l" @@ -321,7 +321,7 @@ BattleFrontier_BattlePyramidTop_Text_255846: @ 8255846 BattleFrontier_BattlePyramidTop_Text_255873: @ 8255873 .string "BRANDON: Hahahah! Grand it was!\n" .string "Grand, yes, indeed!\p" - .string "Well done! You’ve earned recognition!\n" + .string "Well done! You've earned recognition!\n" .string "Your FRONTIER PASS, please!$" BattleFrontier_BattlePyramidTop_Text_2558E9: @ 82558E9 @@ -333,7 +333,7 @@ BattleFrontier_BattlePyramidTop_Text_25591D: @ 825591D .string "I look forward to our next meeting!$" BattleFrontier_BattlePyramidTop_Text_255951: @ 8255951 - .string "BRANDON: …You’ve finally returned,\n" + .string "BRANDON: …You've finally returned,\n" .string "young explorer…\p" .string "Your love of adventure seems to come\n" .string "deep from within your heart…\p" @@ -353,14 +353,14 @@ BattleFrontier_BattlePyramidTop_Text_255A6D: @ 8255A6D BattleFrontier_BattlePyramidTop_Text_255AA1: @ 8255AA1 .string "Everything you have!\n" - .string "I’m braced for it all!$" + .string "I'm braced for it all!$" BattleFrontier_BattlePyramidTop_Text_255ACD: @ 8255ACD .string "BRANDON: Hahahah!\n" .string "Remarkable!\l" - .string "Yes, it’s grand, indeed!\p" + .string "Yes, it's grand, indeed!\p" .string "Young explorer!\p" - .string "You’ve bested me through and through!\n" + .string "You've bested me through and through!\n" .string "Here! I want you to have this!$" BattleFrontier_BattlePyramidTop_Text_255B59: @ 8255B59 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 196518e0b..83b78d40e 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E switch VAR_RESULT @@ -81,7 +81,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241C2F:: @ 8241C2F waitmovement 0 applymovement 255, BattleFrontier_BattleTowerBattleRoom_Movement_24217E waitmovement 0 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242217, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -129,7 +129,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241D72:: @ 8241D72 goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F BattleFrontier_BattleTowerBattleRoom_EventScript_241D7C:: @ 8241D7C - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_241C8F case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_241E22 @@ -247,7 +247,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241F0A:: @ 8241F0A compare VAR_TEMP_2, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241F22 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2424C2, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 BattleFrontier_BattleTowerBattleRoom_EventScript_241F22:: @ 8241F22 @@ -291,13 +291,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241FAF:: @ 8241FAF special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242579, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_242029:: @ 8242029 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24268C, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_242046 @@ -309,14 +309,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242046:: @ 8242046 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2426B4, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_24270E waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_242744, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 @@ -325,13 +325,13 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242085:: @ 8242085 special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2427F9, MSGBOX_DEFAULT setvar VAR_0x8004, 2 setvar VAR_0x8005, 7 special CallFrontierUtilFunc BattleFrontier_BattleTowerBattleRoom_EventScript_2420B2:: @ 82420B2 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428E0, MSGBOX_DEFAULT call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E compare VAR_RESULT, 1 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF @@ -343,14 +343,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2420CF:: @ 82420CF special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 - msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_2428F7, MSGBOX_DEFAULT playfanfare MUS_ME_SYMBOLGET message BattleFrontier_BattleTowerBattleRoom_Text_242932 waitmessage waitfanfare setvar VAR_0x8004, 13 special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, 4 + msgbox BattleFrontier_BattleTowerBattleRoom_Text_24295D, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom_EventScript_241DF6 BattleFrontier_BattleTowerBattleRoom2_EventScript_24210E:: @ 824210E @@ -556,7 +556,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_2423A3: @ 82423A3 .string "FRONTIER PASS?$" BattleFrontier_BattleTowerLobby_Text_2423CD: @ 82423CD - .string "{PLAYER}’s battle was recorded\n" + .string "{PLAYER}'s battle was recorded\n" .string "on the FRONTIER PASS.$" BattleFrontier_BattleTowerBattleRoom2_Text_2423FC: @ 82423FC @@ -597,7 +597,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_242579: @ 8242579 .string "about you…\p" .string "In all honesty, what I have heard does\n" .string "not seem attractive in any way…\p" - .string "The reason I’ve come to see you…\n" + .string "The reason I've come to see you…\n" .string "Well, there is but one reason…$" BattleFrontier_BattleTowerBattleRoom_Text_24268C: @ 824268C @@ -616,7 +616,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_24270E: @ 824270E BattleFrontier_BattleTowerBattleRoom_Text_242744: @ 8242744 .string "… … … … … …\p" .string "You have confidence in your POKéMON\n" - .string "battling talent, don’t you?\p" + .string "battling talent, don't you?\p" .string "I urge you to keep battling and\n" .string "keep on winning.\p" .string "I will be waiting for you.\n" @@ -626,14 +626,14 @@ BattleFrontier_BattleTowerBattleRoom_Text_2427F9: @ 82427F9 .string "ANABEL: You really did come back to\n" .string "see me…\p" .string "… … … … … …\p" - .string "You’ve won straight matches to see me…\n" - .string "I won’t have to hold back against you…\p" - .string "It’s been too long now…\p" - .string "Too long since I’ve been able to battle\n" + .string "You've won straight matches to see me…\n" + .string "I won't have to hold back against you…\p" + .string "It's been too long now…\p" + .string "Too long since I've been able to battle\n" .string "without thinking about anything…$" BattleFrontier_BattleTowerBattleRoom_Text_2428E0: @ 82428E0 - .string "Let’s begin, shall we?$" + .string "Let's begin, shall we?$" BattleFrontier_BattleTowerBattleRoom_Text_2428F7: @ 82428F7 .string "ANABEL: Fufu, congratulations…\n" diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index de242cbcc..fa17ef5af 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 delay 15 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 special sub_8161F74 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 @@ -144,7 +144,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2490AA:: @ 82490AA waitmovement 0 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_249118 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, 4 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_242217, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249121 BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118 @@ -203,7 +203,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249219:: @ 8249219 goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 BattleFrontier_BattleTowerBattleRoom2_EventScript_249223:: @ 8249223 - msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, 5 + msgbox BattleFrontier_BattleTowerBattleRoom2_Text_2423FC, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerBattleRoom2_EventScript_249143 case 1, BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 1afa9e120..0911ea5f2 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -55,7 +55,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E707:: @ 823E707 BattleFrontier_BattleTowerLobby_EventScript_23E710:: @ 823E710 lock faceplayer - msgbox BattleFrontier_BattleTowerLobby_Text_23F583, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F583, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 1 @@ -85,7 +85,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E758:: @ 823E758 goto BattleFrontier_BattleTowerLobby_EventScript_23E780 BattleFrontier_BattleTowerLobby_EventScript_23E778:: @ 823E778 - msgbox BattleFrontier_BattleTowerLobby_Text_241486, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241486, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 setvar VAR_0x8004, 5 @@ -96,10 +96,10 @@ BattleFrontier_BattleTowerLobby_EventScript_23E780:: @ 823E780 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F89F, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 - msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2414D4, MSGBOX_DEFAULT setvar VAR_0x8004, 11 special CallFrontierUtilFunc msgbox BattleFrontier_BattleTowerLobby_Text_241520, 9 @@ -109,10 +109,10 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7A5:: @ 823E7A5 special sub_8161F74 compare VAR_RESULT, 49 goto_if 5, BattleFrontier_BattleTowerLobby_EventScript_23E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F79D, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -141,7 +141,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E830:: @ 823E830 message BattleFrontier_BattleTowerLobby_Text_23F6F7 waitmessage call BattleFrontier_BattleTowerLobby_EventScript_23E84D - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 release @@ -186,11 +186,11 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8B4:: @ 823E8B4 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E8D7 playse SE_SAVE - msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2423CD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E8DF BattleFrontier_BattleTowerLobby_EventScript_23E8D7:: @ 823E8D7 - msgbox gText_BattleRecordCouldntBeSaved, 4 + msgbox gText_BattleRecordCouldntBeSaved, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E8DF:: @ 823E8DF return @@ -241,7 +241,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240537, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948 message BattleFrontier_BattleTowerLobby_Text_2405B3 @@ -269,7 +269,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -278,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EA2A @@ -312,7 +312,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A end BattleFrontier_BattleTowerLobby_EventScript_23EA91:: @ 823EA91 - msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2405EC, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23E948 end @@ -321,7 +321,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1 message BattleFrontier_BattleTowerLobby_Text_24085E @@ -349,7 +349,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_240A50, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -358,7 +358,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EB93 @@ -392,7 +392,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93 end BattleFrontier_BattleTowerLobby_EventScript_23EBFA:: @ 823EBFA - msgbox BattleFrontier_BattleTowerLobby_Text_240897, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240897, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EAB1 end @@ -402,7 +402,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 setvar VAR_FRONTIER_FACILITY, 0 clearflag FLAG_0x152 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D message BattleFrontier_BattleTowerLobby_Text_240B06 @@ -430,7 +430,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -439,7 +439,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23ECFF @@ -473,7 +473,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF end BattleFrontier_BattleTowerLobby_EventScript_23ED66:: @ 823ED66 - msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240B3E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23EC1D end @@ -482,7 +482,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74 faceplayer setvar VAR_FRONTIER_FACILITY, 0 special SavePlayerParty - msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240E15, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86 message BattleFrontier_BattleTowerLobby_Text_240E95 @@ -510,7 +510,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 setvar VAR_0x8005, 1 copyvar VAR_0x8006, VAR_RESULT special CallFrontierUtilFunc - msgbox BattleFrontier_BattleTowerLobby_Text_24115E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT fadescreen 1 call BattleFrontier_BattleTowerLobby_EventScript_23F2B7 copyvar VAR_0x8004, VAR_RESULT @@ -519,7 +519,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 - msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, 5 + msgbox BattleFrontier_BattleTowerLobby_Text_23FDC7, MSGBOX_YESNO switch VAR_RESULT case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0E3 case 1, BattleFrontier_BattleTowerLobby_EventScript_23EE68 @@ -573,7 +573,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7 end BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 - msgbox BattleFrontier_BattleTowerLobby_Text_23F969, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT setvar VAR_0x8004, 1 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -582,7 +582,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32 end BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C - msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT setvar VAR_0x8004, 2 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -591,7 +591,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C end BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 - msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT setvar VAR_0x8004, 3 call BattleFrontier_BattleTowerLobby_EventScript_271E7C lock @@ -600,7 +600,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66 end BattleFrontier_BattleTowerLobby_EventScript_23EF80:: @ 823EF80 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA0F, MSGBOX_DEFAULT release end @@ -612,21 +612,21 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF8A:: @ 823EF8A end BattleFrontier_BattleTowerLobby_EventScript_23EFA1:: @ 823EFA1 - msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA4F, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFAB:: @ 823EFAB - msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FA83, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23EFB5:: @ 823EFB5 - msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FAC0, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFBE:: @ 823EFBE - msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, 2 + msgbox BattleFrontier_BattleTowerLobby_Text_23FB26, MSGBOX_NPC end BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7 @@ -682,17 +682,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23F046:: @ 823F046 switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F06F case 1, BattleFrontier_BattleTowerLobby_EventScript_23F07D - msgbox BattleFrontier_BattleTowerLobby_Text_24038B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24038B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F06F:: @ 823F06F - msgbox BattleFrontier_BattleTowerLobby_Text_240027, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240027, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F07D:: @ 823F07D - msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2401DB, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end @@ -700,17 +700,17 @@ BattleFrontier_BattleTowerLobby_EventScript_23F08B:: @ 823F08B switch VAR_FRONTIER_BATTLE_MODE case 0, BattleFrontier_BattleTowerLobby_EventScript_23F0B4 case 1, BattleFrontier_BattleTowerLobby_EventScript_23F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_24046B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24046B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0B4:: @ 823F0B4 - msgbox BattleFrontier_BattleTowerLobby_Text_24010B, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24010B, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end BattleFrontier_BattleTowerLobby_EventScript_23F0C2:: @ 823F0C2 - msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2402BD, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F0F1 end @@ -726,7 +726,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6 special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FD07, MSGBOX_DEFAULT BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1 release @@ -756,7 +756,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F135:: @ 823F135 call BattleFrontier_BattleTowerLobby_EventScript_23F1A7 compare VAR_FRONTIER_BATTLE_MODE, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F152 - msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_23FE11, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F15B BattleFrontier_BattleTowerLobby_EventScript_23F152:: @ 823F152 @@ -954,20 +954,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F327:: @ 823F327 special CloseLink compare VAR_0x8005, 3 goto_eq BattleFrontier_BattleTowerLobby_EventScript_23F33F - msgbox BattleFrontier_BattleTowerLobby_Text_278255, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_278255, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F33F:: @ 823F33F - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F351:: @ 823F351 - msgbox BattleFrontier_BattleTowerLobby_Text_241240, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241240, MSGBOX_DEFAULT special CloseLink - msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2782A8, MSGBOX_DEFAULT release end @@ -979,20 +979,20 @@ BattleFrontier_BattleTowerLobby_EventScript_23F366:: @ 823F366 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F39D compare VAR_0x8005, 2 call_if 1, BattleFrontier_BattleTowerLobby_EventScript_23F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2413DE, MSGBOX_DEFAULT release end BattleFrontier_BattleTowerLobby_EventScript_23F394:: @ 823F394 - msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412E8, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F39D:: @ 823F39D - msgbox BattleFrontier_BattleTowerLobby_Text_241285, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241285, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6 - msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_2412B3, MSGBOX_DEFAULT return BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF @@ -1012,7 +1012,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF end BattleFrontier_BattleTowerLobby_EventScript_23F3DA:: @ 823F3DA - msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_240ED2, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23ED86 end @@ -1075,7 +1075,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496 BattleFrontier_BattleTowerLobby_EventScript_23F4BE:: @ 823F4BE lockall - msgbox BattleFrontier_BattleTowerLobby_Text_241540, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241540, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end @@ -1093,22 +1093,22 @@ BattleFrontier_BattleTowerLobby_EventScript_23F4CD:: @ 823F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F520:: @ 823F520 - msgbox BattleFrontier_BattleTowerLobby_Text_241586, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241586, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F52E:: @ 823F52E - msgbox BattleFrontier_BattleTowerLobby_Text_241693, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241693, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F53C:: @ 823F53C - msgbox BattleFrontier_BattleTowerLobby_Text_241777, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_241777, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end BattleFrontier_BattleTowerLobby_EventScript_23F54A:: @ 823F54A - msgbox BattleFrontier_BattleTowerLobby_Text_24187E, 4 + msgbox BattleFrontier_BattleTowerLobby_Text_24187E, MSGBOX_DEFAULT goto BattleFrontier_BattleTowerLobby_EventScript_23F4CD end @@ -1117,18 +1117,18 @@ BattleFrontier_BattleTowerLobby_EventScript_23F558:: @ 823F558 end BattleFrontier_BattleTowerLobby_EventScript_23F55A: @ 823F55A - .string "I’ll direct you to your BATTLE ROOM now.$" + .string "I'll direct you to your BATTLE ROOM now.$" BattleFrontier_BattleTowerLobby_Text_23F583: @ 823F583 .string "Excuse me!\p" - .string "You didn’t save before you quit your\n" + .string "You didn't save before you quit your\n" .string "challenge last time.\p" .string "Because of that, your challenge so far\n" .string "has been disqualified. Sorry!$" BattleFrontier_BattleTowerLobby_Text_23F60D: @ 823F60D .string "Congratulations!\n" - .string "You’ve beaten all seven TRAINERS!\p" + .string "You've beaten all seven TRAINERS!\p" .string "$" BattleFrontier_BattleTowerLobby_Text_23F641: @ 823F641 @@ -1154,7 +1154,7 @@ BattleFrontier_BattleTowerLobby_Text_23F70F: @ 823F70F .string "Please wait.$" BattleFrontier_BattleTowerLobby_Text_23F737: @ 823F737 - .string "We’ve been waiting for you!\p" + .string "We've been waiting for you!\p" .string "$" BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 @@ -1162,7 +1162,7 @@ BattleFrontier_BattleTowerLobby_Text_23F754: @ 823F754 .string "progress will be saved. Please wait.$" BattleFrontier_BattleTowerLobby_Text_23F79D: @ 823F79D - .string "You’re finally about to face the\n" + .string "You're finally about to face the\n" .string "50th TRAINER.\p" .string "From here on, every time you beat seven\n" .string "TRAINERS in a row, your POKéMON will\l" @@ -1181,16 +1181,16 @@ BattleFrontier_BattleTowerLobby_Text_23F89F: @ 823F89F BattleFrontier_BattleTowerLobby_Text_23F8CD: @ 823F8CD .string "Excuse me, do you have a moment?\p" .string "Can you describe your feelings when\n" - .string "you’re about to begin a BATTLE TOWER\l" - .string "match, or when you’ve either won or\l" + .string "you're about to begin a BATTLE TOWER\l" + .string "match, or when you've either won or\l" .string "lost a match?$" BattleFrontier_BattleTowerLobby_Text_23F969: @ 823F969 .string "Okay, what are your feelings when\n" - .string "you’re about to begin a match?$" + .string "you're about to begin a match?$" BattleFrontier_BattleTowerLobby_Text_23F9AA: @ 823F9AA - .string "What do you feel when you’ve won\n" + .string "What do you feel when you've won\n" .string "a match?$" BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 @@ -1198,29 +1198,29 @@ BattleFrontier_BattleTowerLobby_Text_23F9D4: @ 823F9D4 .string "you have lost a match?$" BattleFrontier_BattleTowerLobby_Text_23FA0F: @ 823FA0F - .string "Oh, so you don’t think much about it?\n" - .string "You’re one cool customer.$" + .string "Oh, so you don't think much about it?\n" + .string "You're one cool customer.$" BattleFrontier_BattleTowerLobby_Text_23FA4F: @ 823FA4F .string "Hunh? You changed your mind?\n" - .string "I guess you’re fickle.$" + .string "I guess you're fickle.$" BattleFrontier_BattleTowerLobby_Text_23FA83: @ 823FA83 - .string "Okay, so that’s how you feel?\n" - .string "That’s quite original.\p" + .string "Okay, so that's how you feel?\n" + .string "That's quite original.\p" .string "Thanks!$" BattleFrontier_BattleTowerLobby_Text_23FAC0: @ 823FAC0 .string "The number of matches you win in a row\n" .string "is recorded.\p" - .string "I’d better not get beaten in\n" + .string "I'd better not get beaten in\n" .string "an embarrassing way!$" BattleFrontier_BattleTowerLobby_Text_23FB26: @ 823FB26 - .string "Once you’ve entered the BATTLE TOWER,\n" - .string "you can’t leave until you either lose\l" + .string "Once you've entered the BATTLE TOWER,\n" + .string "you can't leave until you either lose\l" .string "or you beat seven TRAINERS in a row.\p" - .string "You’d best be certain that you’re up\n" + .string "You'd best be certain that you're up\n" .string "to the challenge.$" BattleFrontier_BattleTowerLobby_Text_23FBCE: @ 823FBCE @@ -1266,7 +1266,7 @@ BattleFrontier_BattleTowerLobby_Text_23FE3C: @ 823FE3C BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1276,7 +1276,7 @@ BattleFrontier_BattleTowerLobby_Text_23FE7F: @ 823FE7F BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D .string "Excuse me!\p" - .string "You don’t have {STR_VAR_2} eligible POKéMON.\p" + .string "You don't have {STR_VAR_2} eligible POKéMON.\p" .string "You must have {STR_VAR_2} different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1286,7 +1286,7 @@ BattleFrontier_BattleTowerLobby_Text_23FF5D: @ 823FF5D BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1296,7 +1296,7 @@ BattleFrontier_BattleTowerLobby_Text_240027: @ 8240027 BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B .string "Excuse me!\p" - .string "You don’t have three eligible POKéMON.\p" + .string "You don't have three eligible POKéMON.\p" .string "You must have three different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1306,7 +1306,7 @@ BattleFrontier_BattleTowerLobby_Text_24010B: @ 824010B BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" + .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1316,7 +1316,7 @@ BattleFrontier_BattleTowerLobby_Text_2401DB: @ 82401DB BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD .string "Excuse me!\p" - .string "You don’t have four eligible POKéMON.\p" + .string "You don't have four eligible POKéMON.\p" .string "You must have four different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1326,7 +1326,7 @@ BattleFrontier_BattleTowerLobby_Text_2402BD: @ 82402BD BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" + .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" .string "of Level 50 or less to enter.\p" .string "They also must be holding different\n" @@ -1336,7 +1336,7 @@ BattleFrontier_BattleTowerLobby_Text_24038B: @ 824038B BattleFrontier_BattleTowerLobby_Text_24046B: @ 824046B .string "Excuse me!\p" - .string "You don’t have two eligible POKéMON.\p" + .string "You don't have two eligible POKéMON.\p" .string "You must have two different POKéMON\n" .string "to enter.\p" .string "They also must be holding different\n" @@ -1356,7 +1356,7 @@ BattleFrontier_BattleTowerLobby_Text_2405B3: @ 82405B3 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC - .string "The BATTLE TOWER’s SINGLE BATTLE\n" + .string "The BATTLE TOWER's SINGLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "SINGLE BATTLES with three POKéMON.\p" .string "There are many SINGLE BATTLE ROOMS\n" @@ -1367,7 +1367,7 @@ BattleFrontier_BattleTowerLobby_Text_2405EC: @ 82405EC .string "you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_2407A6: @ 82407A6 @@ -1386,7 +1386,7 @@ BattleFrontier_BattleTowerLobby_Text_24085E: @ 824085E .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 - .string "The BATTLE TOWER’s DOUBLE BATTLE\n" + .string "The BATTLE TOWER's DOUBLE BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "DOUBLE BATTLES with four POKéMON.\p" .string "There are many DOUBLE BATTLE ROOMS\n" @@ -1397,7 +1397,7 @@ BattleFrontier_BattleTowerLobby_Text_240897: @ 8240897 .string "you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_240A50: @ 8240A50 @@ -1416,7 +1416,7 @@ BattleFrontier_BattleTowerLobby_Text_240B06: @ 8240B06 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E - .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES.\p" .string "For MULTI BATTLES, you must partner\n" @@ -1435,7 +1435,7 @@ BattleFrontier_BattleTowerLobby_Text_240B3E: @ 8240B3E .string "teams, you will earn Battle Points.\p" .string "If you want to interrupt your\n" .string "challenge, please save the game.\p" - .string "If you don’t save before interrupting,\n" + .string "If you don't save before interrupting,\n" .string "you will be disqualified.$" BattleFrontier_BattleTowerLobby_Text_240DDB: @ 8240DDB @@ -1454,7 +1454,7 @@ BattleFrontier_BattleTowerLobby_Text_240E95: @ 8240E95 .string "BATTLE ROOM challenge?$" BattleFrontier_BattleTowerLobby_Text_240ED2: @ 8240ED2 - .string "The BATTLE TOWER’s MULTI BATTLE\n" + .string "The BATTLE TOWER's MULTI BATTLE\n" .string "ROOMS are facilities for conducting\l" .string "MULTI BATTLES with a friend.\p" .string "You must link with your friend using\n" @@ -1482,7 +1482,7 @@ BattleFrontier_BattleTowerLobby_Text_241198: @ 8241198 .string "You have chosen the same kind of\n" .string "POKéMON as your friend.\p" .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" + .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" BattleFrontier_BattleTowerLobby_Text_241240: @ 8241240 @@ -1515,7 +1515,7 @@ BattleFrontier_BattleTowerLobby_Text_241378: @ 8241378 BattleFrontier_BattleTowerLobby_Text_2413DE: @ 82413DE .string "Please choose two POKéMON different\n" - .string "from your friend’s, match the level\l" + .string "from your friend's, match the level\l" .string "you wish to enter, and register again.$" BattleFrontier_BattleTowerLobby_Text_24144D: @ 824144D @@ -1570,7 +1570,7 @@ BattleFrontier_BattleTowerLobby_Text_241777: @ 8241777 .string "find a partner to form a tag team for\l" .string "the MULTI BATTLE ROOM challenge.\p" .string "Choose the best partner for you by\n" - .string "examining other TRAINERS’\l" + .string "examining other TRAINERS'\l" .string "POKéMON and their moves.\p" .string "You may choose a new tag partner\n" .string "after winning seven straight matches.$" diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index f16b7e6a0..b0c35a7fc 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -67,7 +67,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 moveobjectoffscreen 1 applymovement 255, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT special HealPlayerParty setvar VAR_TEMP_1, 1 releaseall @@ -90,7 +90,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A multichoicedefault 20, 8, 94, 1, 0 compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_24410C, MSGBOX_DEFAULT release end @@ -103,7 +103,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 - msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, 4 + msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_2725A6 waitmovement 0 @@ -312,11 +312,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244149:: @ 8244149 .string "MULTI BATTLE ROOM.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24419A:: @ 824419A - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "You can call me {STR_VAR_3}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2441CA:: @ 82441CA - .string "On {STR_VAR_1}’s advice, I brought\n" + .string "On {STR_VAR_1}'s advice, I brought\n" .string "one {STR_VAR_3} with {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 @@ -325,14 +325,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2441F7:: @ 82441F7 BattleFrontier_BattleTowerMultiBattleRoom_Text_24422E:: @ 824422E .string "Thank you!\n" - .string "I’ll go register right now.$" + .string "I'll go register right now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244255:: @ 8244255 .string "I really wanted to form a tag team\n" .string "with you, {PLAYER}…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244286:: @ 8244286 - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" .string "My name is {STR_VAR_3}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 @@ -341,21 +341,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2442B2:: @ 82442B2 BattleFrontier_BattleTowerMultiBattleRoom_Text_2442E4:: @ 82442E4 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Please, let’s form a tag team!$" + .string "Please, let's form a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244313:: @ 8244313 .string "Thank you very much!\n" - .string "I’ll be done with registration quickly!$" + .string "I'll be done with registration quickly!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244350:: @ 8244350 .string "{PLAYER}, I was hoping that I could\n" .string "partner up with you…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244383:: @ 8244383 - .string "Um, my name’s {STR_VAR_3}, and I’m\n" - .string "{STR_VAR_1}’s no. {STR_VAR_2} apprentice.\p" + .string "Um, my name's {STR_VAR_3}, and I'm\n" + .string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice.\p" .string "Snivel…\p" - .string "I’m sorry!\n" + .string "I'm sorry!\n" .string "This tension is making me cry…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2443E7:: @ 82443E7 @@ -370,18 +370,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244413:: @ 8244413 BattleFrontier_BattleTowerMultiBattleRoom_Text_24444B:: @ 824444B .string "Oh, really? You will?\n" .string "Awesome! Wicked! Awoooh!\p" - .string "Oh… I’m sorry…\n" - .string "I’m so happy, I’m crying…\p" - .string "I’ll go register right away.\n" - .string "Please don’t go away!$" + .string "Oh… I'm sorry…\n" + .string "I'm so happy, I'm crying…\p" + .string "I'll go register right away.\n" + .string "Please don't go away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2444D6:: @ 82444D6 .string "Oh, b-but…\n" .string "Sob… Waaaaah!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2444EF:: @ 82444EF - .string "Hi, there! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Hi, there! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E .string "{STR_VAR_3} recommended my crew.\n" @@ -389,20 +389,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24451E:: @ 824451E BattleFrontier_BattleTowerMultiBattleRoom_Text_244549:: @ 8244549 .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what I have! Cool, huh?\p" + .string "that's what I have! Cool, huh?\p" .string "So come on!\n" - .string "Let’s form a tag team!$" + .string "Let's form a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24459B:: @ 824459B .string "Yay! Great!\n" - .string "Okay, I’ll go register, okay?$" + .string "Okay, I'll go register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2445C5:: @ 82445C5 .string "Aww, why?\n" .string "I wanted to team up, {PLAYER}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2445E8:: @ 82445E8 - .string "I’m {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" + .string "I'm {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n" .string "of the famous {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 @@ -411,50 +411,50 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244618:: @ 8244618 BattleFrontier_BattleTowerMultiBattleRoom_Text_244643:: @ 8244643 .string "and one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s my pair.\p" + .string "that's my pair.\p" .string "Please, will you join me in\n" .string "a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24468F:: @ 824468F .string "Thank you!\n" - .string "I’ll register right away!$" + .string "I'll register right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2446B4:: @ 82446B4 .string "{PLAYER}, I had been hoping to join\n" .string "you in a tag team…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2446E5:: @ 82446E5 - .string "Um… I’m sincerely happy that you\n" + .string "Um… I'm sincerely happy that you\n" .string "would take the time to talk to me.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice…$" + .string "I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24474D:: @ 824474D .string "{STR_VAR_3} gave me advice.\n" - .string "I’m very grateful for it.\p" + .string "I'm very grateful for it.\p" .string "I have a team of one {STR_VAR_2}\n" .string "with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24479E:: @ 824479E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" - .string "I know I’m asking a lot…\p" - .string "I don’t think you’ll be willing to,\n" + .string "I know I'm asking a lot…\p" + .string "I don't think you'll be willing to,\n" .string "but may I join you as a partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24480C:: @ 824480C - .string "Really? I can’t believe it!\n" - .string "I can’t believe you’ll let me join you!\l" - .string "I… I won’t let you down!\p" - .string "Um… If it’s really okay, I’ll go register\n" + .string "Really? I can't believe it!\n" + .string "I can't believe you'll let me join you!\l" + .string "I… I won't let you down!\p" + .string "Um… If it's really okay, I'll go register\n" .string "right this instant!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448A7:: @ 82448A7 .string "Oh…\n" - .string "I didn’t think I was good enough…$" + .string "I didn't think I was good enough…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448CD:: @ 82448CD - .string "Hi, I’m {STR_VAR_3}.\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Hi, I'm {STR_VAR_3}.\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2448F5:: @ 82448F5 .string "{STR_VAR_3} told me that it would be\n" @@ -469,18 +469,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244939:: @ 8244939 BattleFrontier_BattleTowerMultiBattleRoom_Text_244989:: @ 8244989 .string "Okay, glad to join you!\n" - .string "I hope you won’t mess things up for me!\l" - .string "I’ll do my registration now.$" + .string "I hope you won't mess things up for me!\l" + .string "I'll do my registration now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2449E6:: @ 82449E6 .string "Huh? Why did you turn me down?\n" - .string "You’re no judge of character!$" + .string "You're no judge of character!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244A23:: @ 8244A23 - .string "I’m {STR_VAR_3} and I’m a TRIATHLETE.\n" - .string "I’m busy every day what with jogging,\l" + .string "I'm {STR_VAR_3} and I'm a TRIATHLETE.\n" + .string "I'm busy every day what with jogging,\l" .string "training, and rapping.\p" - .string "I also happen to be {STR_VAR_1}’s\n" + .string "I also happen to be {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244AA9:: @ 8244AA9 @@ -491,12 +491,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244AD6:: @ 8244AD6 .string "and one {STR_VAR_1}-using\n" .string "{STR_VAR_2}.\p" .string "I put a lot of effort into raising\n" - .string "them, even though I’m busy.\p" - .string "Let’s form a tag team\n" + .string "them, even though I'm busy.\p" + .string "Let's form a tag team\n" .string "and give it a go!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244B52:: @ 8244B52 - .string "Thanks, that’s the spirit!\n" + .string "Thanks, that's the spirit!\n" .string "Hang tight while I go register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 @@ -505,8 +505,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244B93:: @ 8244B93 BattleFrontier_BattleTowerMultiBattleRoom_Text_244BD2:: @ 8244BD2 .string "Hi!\n" - .string "How’s it going?\p" - .string "I’m {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "How's it going?\p" + .string "I'm {STR_VAR_3}, {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice. Glad to meet you!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244C18:: @ 8244C18 @@ -518,20 +518,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244C6E:: @ 8244C6E .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Of course I raised them superbly!\p" .string "So, want to team up?\n" - .string "I’m sure it’ll be a great combo!$" + .string "I'm sure it'll be a great combo!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244CD6:: @ 8244CD6 .string "Yay, I think this will be fun!\n" - .string "I’ll go register!$" + .string "I'll go register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D07:: @ 8244D07 - .string "Oh, you’re mean!\n" + .string "Oh, you're mean!\n" .string "I come recommended, you know.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D36:: @ 8244D36 .string "Please let me introduce myself.\n" .string "I am {STR_VAR_3}.\p" - .string "I serve as {STR_VAR_1}’s\n" + .string "I serve as {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244D82:: @ 8244D82 @@ -544,7 +544,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244DC6:: @ 8244DC6 .string "Please agree to a tag team with me!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244DFE:: @ 8244DFE - .string "Oh… I’m delighted!\n" + .string "Oh… I'm delighted!\n" .string "I promise to give you my best!\p" .string "Of course I will register us!\n" .string "Please wait!$" @@ -555,12 +555,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244E5B:: @ 8244E5B BattleFrontier_BattleTowerMultiBattleRoom_Text_244E7E:: @ 8244E7E .string "Eek! You spoke to me!\n" - .string "I… I’m overjoyed!\p" - .string "I’m {STR_VAR_3}! I’m {STR_VAR_1}’s\n" + .string "I… I'm overjoyed!\p" + .string "I'm {STR_VAR_3}! I'm {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244ECA:: @ 8244ECA - .string "On {STR_VAR_3}’s advice, I trained\n" + .string "On {STR_VAR_3}'s advice, I trained\n" .string "one {STR_VAR_1}-using {STR_VAR_2}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 @@ -572,16 +572,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_244EF4:: @ 8244EF4 BattleFrontier_BattleTowerMultiBattleRoom_Text_244F4F:: @ 8244F4F .string "Eek! I… I feel giddy!\n" .string "Thank you so much!\l" - .string "I’ll go register us right away!$" + .string "I'll go register us right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244F98:: @ 8244F98 - .string "Waaah! Don’t you feel any pity?\n" + .string "Waaah! Don't you feel any pity?\n" .string "But that makes you cooler…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_244FD3:: @ 8244FD3 - .string "Yeehaw! I’m {STR_VAR_1}’s\n" + .string "Yeehaw! I'm {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice!\p" - .string "{STR_VAR_3}’s my name, hello, hello!$" + .string "{STR_VAR_3}'s my name, hello, hello!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245013:: @ 8245013 .string "My mentor {STR_VAR_3} recommended\n" @@ -591,24 +591,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24503D:: @ 824503D .string "and one {STR_VAR_1}-master\n" .string "{STR_VAR_2}.\p" .string "Good stuff, huh?\n" - .string "You’ll partner with me, won’t you?$" + .string "You'll partner with me, won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245087:: @ 8245087 .string "Okay, excellent!\n" - .string "I’ll get the registration done quickly!$" + .string "I'll get the registration done quickly!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2450C0:: @ 82450C0 .string "Gwaaah!\n" - .string "You’re a calculating one, {PLAYER}!$" + .string "You're a calculating one, {PLAYER}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2450E6:: @ 82450E6 - .string "Hey! There’s big trouble! This is\n" - .string "the BATTLE TOWER’s last day!\p" + .string "Hey! There's big trouble! This is\n" + .string "the BATTLE TOWER's last day!\p" .string "… … … … … …\n" - .string "I’m only joking!\p" + .string "I'm only joking!\p" .string "People call me {STR_VAR_3} and I do, too!\n" - .string "I’m {STR_VAR_1}’s 1,000th apprentice!\l" - .string "Actually, I’m no. {STR_VAR_2}!$" + .string "I'm {STR_VAR_1}'s 1,000th apprentice!\l" + .string "Actually, I'm no. {STR_VAR_2}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 .string "{STR_VAR_3} gave me some advice.\n" @@ -616,29 +616,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245196:: @ 8245196 BattleFrontier_BattleTowerMultiBattleRoom_Text_2451BD:: @ 82451BD .string "{STR_VAR_2} with {STR_VAR_1}.\n" - .string "I’ve got ten of each kind!\l" + .string "I've got ten of each kind!\l" .string "Actually, just one of each!\p" .string "How about it?\n" .string "Want to try tag battles with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24522F:: @ 824522F .string "Yippee!\n" - .string "I’ll give you a POKéMON as my thanks!\p" + .string "I'll give you a POKéMON as my thanks!\p" .string "Just joking! But I will really go do\n" .string "the registration, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24529A:: @ 824529A - .string "Oh, that’s so cold! I’ll have to wreck\n" + .string "Oh, that's so cold! I'll have to wreck\n" .string "the BATTLE TOWER for that!\p" - .string "Of course I won’t!$" + .string "Of course I won't!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2452EF:: @ 82452EF - .string "Hey, there, I’m rockin’ and a-rollin’!\n" - .string "POKéMON, I be controllin’!\p" - .string "I’m {STR_VAR_3} the rappin’ SAILOR.\n" - .string "Don’t be mistakin’ me for no wailer!\p" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice.\n" - .string "Me, you shouldn’t be quick to dismiss!$" + .string "Hey, there, I'm rockin' and a-rollin'!\n" + .string "POKéMON, I be controllin'!\p" + .string "I'm {STR_VAR_3} the rappin' SAILOR.\n" + .string "Don't be mistakin' me for no wailer!\p" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n" + .string "Me, you shouldn't be quick to dismiss!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2453B4:: @ 82453B4 .string "With the advice of {STR_VAR_3} I did\n" @@ -656,14 +656,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245464:: @ 8245464 .string "Our registration, I will go file!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2454A3:: @ 82454A3 - .string "Oh, hey, {PLAYER}, now that’s cold!\n" + .string "Oh, hey, {PLAYER}, now that's cold!\n" .string "If I may be so bold!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2454D6:: @ 82454D6 .string "Yippee-yahoo!\n" - .string "Oh, don’t run! I was just having fun!\p" - .string "Howdy! I’m {STR_VAR_3}!\n" - .string "I’m {STR_VAR_1}’s no. {STR_VAR_2} apprentice!$" + .string "Oh, don't run! I was just having fun!\p" + .string "Howdy! I'm {STR_VAR_3}!\n" + .string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245535:: @ 8245535 .string "{STR_VAR_3} told me what to do.\n" @@ -674,28 +674,28 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24555F:: @ 824555F .string "{STR_VAR_2}, I did choose.\p" .string "So, what do you say?\n" .string "Come on, make my day!\p" - .string "Please, I’m begging you!\n" - .string "Let me join you, don’t leave me blue!$" + .string "Please, I'm begging you!\n" + .string "Let me join you, don't leave me blue!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2455EC:: @ 82455EC .string "Yeahah! Luck is with me!\n" .string "It sure makes me happy!\p" .string "Before we go join the fray,\n" - .string "I’ll go register right away!$" + .string "I'll go register right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245656:: @ 8245656 - .string "You’re turning me down?\n" - .string "{PLAYER}, you’re making me frown!$" + .string "You're turning me down?\n" + .string "{PLAYER}, you're making me frown!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24568A:: @ 824568A .string "Cough!\p" .string "Oh, sorry, I have a cold.\n" .string "My POKéMON are fine, though.\p" - .string "My name’s {STR_VAR_3}, {STR_VAR_1}’s\n" + .string "My name's {STR_VAR_3}, {STR_VAR_1}'s\n" .string "no. {STR_VAR_2} apprentice. Cough!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2456F5:: @ 82456F5 - .string "I took {STR_VAR_3}’s advice to heart\n" + .string "I took {STR_VAR_3}'s advice to heart\n" .string "and put together my team of\l" .string "one {STR_VAR_2} with {STR_VAR_1} and$" @@ -703,9 +703,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245740:: @ 8245740 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "I trained them every day,\n" .string "even in wind and rain.\p" - .string "That’s why I have this cold,\n" + .string "That's why I have this cold,\n" .string "I think.\p" - .string "That’s what I’m about.\n" + .string "That's what I'm about.\n" .string "Want to be my tag partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 @@ -714,36 +714,36 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2457D9:: @ 82457D9 .string "Hang on while I go register.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24581F:: @ 824581F - .string "Oh, you won’t?\n" - .string "{PLAYER}, I think we’d make a good pair.$" + .string "Oh, you won't?\n" + .string "{PLAYER}, I think we'd make a good pair.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245851:: @ 8245851 .string "Oh, hello!\n" .string "This is nerve-racking.\p" - .string "I’m {STR_VAR_3}.\n" - .string "I’m the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" + .string "I'm {STR_VAR_3}.\n" + .string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24589C:: @ 824589C - .string "{STR_VAR_3} said this team’ll be good--\n" + .string "{STR_VAR_3} said this team'll be good--\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2458CE:: @ 82458CE .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "I’m feeling self-conscious about this,\n" + .string "I'm feeling self-conscious about this,\n" .string "but will you let me join you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245923:: @ 8245923 .string "Oh, gee, thank you!\n" - .string "I feel bashful, but I’ll do my best!\p" - .string "I’ll go get the registration done.$" + .string "I feel bashful, but I'll do my best!\p" + .string "I'll go get the registration done.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24597F:: @ 824597F - .string "Oh, please don’t say no!\n" + .string "Oh, please don't say no!\n" .string "I feel self-conscious enough already…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2459BE:: @ 82459BE - .string "I am {STR_VAR_3}, and that’s no lie.\n" - .string "I am {STR_VAR_1}’s no. {STR_VAR_2} apprentice.$" + .string "I am {STR_VAR_3}, and that's no lie.\n" + .string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2459F7:: @ 82459F7 .string "{STR_VAR_3} recommended my team.\p" @@ -759,7 +759,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245A5F:: @ 8245A5F BattleFrontier_BattleTowerMultiBattleRoom_Text_245AB4:: @ 8245AB4 .string "You really will accept me?\n" .string "It would be too terrible otherwise.\p" - .string "But since you’ve agreed, this is fine.\n" + .string "But since you've agreed, this is fine.\n" .string "I shall go register the both of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E @@ -767,7 +767,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245B3E:: @ 8245B3E .string "Is this your idea of a joke?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B79:: @ 8245B79 - .string "I’m {STR_VAR_1}, and I’m a LASS!$" + .string "I'm {STR_VAR_1}, and I'm a LASS!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245B91:: @ 8245B91 .string "What I have are one {STR_VAR_2}\n" @@ -780,15 +780,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245BBD:: @ 8245BBD BattleFrontier_BattleTowerMultiBattleRoom_Text_245C05:: @ 8245C05 .string "Thank you!\n" - .string "I’ll go do the registration!$" + .string "I'll go do the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C2D:: @ 8245C2D - .string "You don’t want to be my partner?\n" - .string "You’ll regret it later!$" + .string "You don't want to be my partner?\n" + .string "You'll regret it later!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C66:: @ 8245C66 .string "Hello!\p" - .string "I’m YOUNGSTER {STR_VAR_1}!$" + .string "I'm YOUNGSTER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F .string "Want to know what I have?\n" @@ -796,20 +796,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245C7F:: @ 8245C7F BattleFrontier_BattleTowerMultiBattleRoom_Text_245CAC:: @ 8245CAC .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "You’ll be my tag-team partner,\n" - .string "won’t you?$" + .string "You'll be my tag-team partner,\n" + .string "won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245CE6:: @ 8245CE6 .string "Yay!\n" - .string "I’ll go and register, okay?$" + .string "I'll go and register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D07:: @ 8245D07 - .string "Aww! If you’d form a tag team with\n" - .string "my POKéMON, we’d be unstoppable!$" + .string "Aww! If you'd form a tag team with\n" + .string "my POKéMON, we'd be unstoppable!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D4B:: @ 8245D4B .string "Yahoo!\n" - .string "I’m HIKER {STR_VAR_1}!$" + .string "I'm HIKER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245D60:: @ 8245D60 .string "Know what I have with me?\n" @@ -822,18 +822,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245D8D:: @ 8245D8D BattleFrontier_BattleTowerMultiBattleRoom_Text_245DC7:: @ 8245DC7 .string "Yahoo!\n" - .string "I’ll go do the registering, then.$" + .string "I'll go do the registering, then.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245DF0:: @ 8245DF0 - .string "I would’ve liked to battle with you\n" + .string "I would've liked to battle with you\n" .string "at my side.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E20:: @ 8245E20 .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a BEAUTY!$" + .string "I'm {STR_VAR_1}, and I'm a BEAUTY!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E41:: @ 8245E41 - .string "Do you know what I’ve been raising?\n" + .string "Do you know what I've been raising?\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 @@ -843,20 +843,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245E78:: @ 8245E78 BattleFrontier_BattleTowerMultiBattleRoom_Text_245EBD:: @ 8245EBD .string "Wonderful!\n" - .string "I’ll get the registration done now!$" + .string "I'll get the registration done now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245EEC:: @ 8245EEC .string "How disappointing!\p" - .string "We two together--we would’ve been\n" + .string "We two together--we would've been\n" .string "the best!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F2B:: @ 8245F2B .string "Yo!\p" .string "You know who I am?\n" - .string "I’m {STR_VAR_1} the FISHERMAN!$" + .string "I'm {STR_VAR_1} the FISHERMAN!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F58:: @ 8245F58 - .string "I’ve got with me a team of one\n" + .string "I've got with me a team of one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 @@ -867,7 +867,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_245F87:: @ 8245F87 BattleFrontier_BattleTowerMultiBattleRoom_Text_245FC6:: @ 8245FC6 .string "Good, good!\n" .string "Leave it up to me!\p" - .string "I’ll go and register us now.$" + .string "I'll go and register us now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246002:: @ 8246002 .string "We matched up perfectly, too…$" @@ -890,11 +890,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2460D5:: @ 82460D5 .string "I shall handle the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24610D:: @ 824610D - .string "I’m sure that you will regret not\n" + .string "I'm sure that you will regret not\n" .string "having me as your partner.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24614A:: @ 824614A - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D .string "What I have…\n" @@ -902,21 +902,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24615D:: @ 824615D BattleFrontier_BattleTowerMultiBattleRoom_Text_24617D:: @ 824617D .string "one {STR_VAR_2} with {STR_VAR_1}!\n" - .string "That’s my pair!\p" + .string "That's my pair!\p" .string "Please?\n" .string "Will you form a tag team with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2461C7:: @ 82461C7 .string "Gee, thanks!\n" - .string "I’ll go register at the counter.$" + .string "I'll go register at the counter.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2461F5:: @ 82461F5 - .string "We two together, we would’ve been\n" + .string "We two together, we would've been\n" .string "tough for certain!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24622A:: @ 824622A .string "Hiya!\n" - .string "I’m BUG CATCHER {STR_VAR_1}!$" + .string "I'm BUG CATCHER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246244:: @ 8246244 .string "Check out what I have!\n" @@ -929,39 +929,39 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24626E:: @ 824626E BattleFrontier_BattleTowerMultiBattleRoom_Text_2462AA:: @ 82462AA .string "Gotcha!\p" - .string "I’ll go do the registration stuff\n" + .string "I'll go do the registration stuff\n" .string "at the counter.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2462E4:: @ 82462E4 .string "Aww, my POKéMON are awesome.\n" - .string "I hope you won’t regret this!$" + .string "I hope you won't regret this!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24631F:: @ 824631F .string "Good day!\n" - .string "I’m SCHOOL KID {STR_VAR_1}!$" + .string "I'm SCHOOL KID {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24633C:: @ 824633C - .string "What I’ve been raising are one\n" + .string "What I've been raising are one\n" .string "{STR_VAR_2} that uses {STR_VAR_1}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24636B:: @ 824636B .string "and one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" - .string "Not too bad, don’t you think?\n" + .string "Not too bad, don't you think?\n" .string "Would you care to form a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2463C5:: @ 82463C5 .string "Thank you very much!\n" - .string "I’ll get done with the registration.$" + .string "I'll get done with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2463FF:: @ 82463FF - .string "That’s too bad…\p" + .string "That's too bad…\p" .string "I was hoping that I could learn\n" .string "from you as your partner…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246449:: @ 8246449 .string "Yo! Let me tell you who I am!\n" - .string "I’m RICH BOY {STR_VAR_1}!$" + .string "I'm RICH BOY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 .string "Guess what I got!\n" @@ -969,17 +969,17 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246478:: @ 8246478 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D:: @ 824649D .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "I’m willing to offer you the chance\n" + .string "I'm willing to offer you the chance\n" .string "to be in a tag team with me.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2464EE:: @ 82464EE .string "Smart move!\p" - .string "I’ll finish up the registration\n" + .string "I'll finish up the registration\n" .string "process quick!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246529:: @ 8246529 - .string "You’d turn me of all people down?\n" - .string "You’ll regret that decision for sure!$" + .string "You'd turn me of all people down?\n" + .string "You'll regret that decision for sure!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246571:: @ 8246571 .string "Hiyah!\n" @@ -1005,10 +1005,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24662A:: @ 824662A BattleFrontier_BattleTowerMultiBattleRoom_Text_246662:: @ 8246662 .string "Hi, there!\n" - .string "I’m {STR_VAR_1}, and I’m a TUBER!$" + .string "I'm {STR_VAR_1}, and I'm a TUBER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246686:: @ 8246686 - .string "I’ll tell you what I have.\n" + .string "I'll tell you what I have.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 @@ -1017,10 +1017,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2466B4:: @ 82466B4 BattleFrontier_BattleTowerMultiBattleRoom_Text_2466E6:: @ 82466E6 .string "Thank you!\n" - .string "I’ll go register us now!$" + .string "I'll go register us now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24670A:: @ 824670A - .string "If we’d become partners, we could\n" + .string "If we'd become partners, we could\n" .string "have been so strong!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246741:: @ 8246741 @@ -1044,11 +1044,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2467E6:: @ 82467E6 .string "I so longed to join you…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2467FF:: @ 82467FF - .string "How do you do? I’m {STR_VAR_1},\n" - .string "and I’m a POKéMON BREEDER!$" + .string "How do you do? I'm {STR_VAR_1},\n" + .string "and I'm a POKéMON BREEDER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246831:: @ 8246831 - .string "I’m raising a couple good ones!\n" + .string "I'm raising a couple good ones!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 @@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246864:: @ 8246864 BattleFrontier_BattleTowerMultiBattleRoom_Text_2468A7:: @ 82468A7 .string "Thank you kindly!\p" - .string "I’ll go take care of the registration\n" + .string "I'll go take care of the registration\n" .string "stuff, so you wait right here!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE @@ -1067,7 +1067,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2468FE:: @ 82468FE BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B:: @ 824692B .string "Well, hello!\n" - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24694B:: @ 824694B .string "Want to know what I run with?\n" @@ -1080,16 +1080,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24697C:: @ 824697C BattleFrontier_BattleTowerMultiBattleRoom_Text_2469B4:: @ 82469B4 .string "Good going!\p" - .string "I’ll be quick and get the registration\n" + .string "I'll be quick and get the registration\n" .string "all done!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2469F1:: @ 82469F1 - .string "You and me, we would’ve been tops.\n" - .string "It’s too bad…$" + .string "You and me, we would've been tops.\n" + .string "It's too bad…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246A22:: @ 8246A22 - .string "Hey, there! My name’s {STR_VAR_1}!\n" - .string "I’m a TRIATHLETE!$" + .string "Hey, there! My name's {STR_VAR_1}!\n" + .string "I'm a TRIATHLETE!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246A4E:: @ 8246A4E .string "I go on runs with my durable team--\n" @@ -1102,17 +1102,17 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246A85:: @ 8246A85 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF:: @ 8246ACF .string "All right!\n" - .string "I’ll go register in a flash!$" + .string "I'll go register in a flash!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246AF7:: @ 8246AF7 .string "I really wanted to battle as your\n" .string "tag-team partner…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B2B:: @ 8246B2B - .string "I’m BATTLE GIRL {STR_VAR_1}!$" + .string "I'm BATTLE GIRL {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B3F:: @ 8246B3F - .string "I’ve been toughening up one\n" + .string "I've been toughening up one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B @@ -1122,7 +1122,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246B6B:: @ 8246B6B BattleFrontier_BattleTowerMultiBattleRoom_Text_246BB2:: @ 8246BB2 .string "Why, thanks!\p" - .string "I’ll get the registration done\n" + .string "I'll get the registration done\n" .string "right now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 @@ -1130,29 +1130,29 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246BE9:: @ 8246BE9 .string "the ultimate tag team…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C22:: @ 8246C22 - .string "I’m TRIATHLETE {STR_VAR_1}!$" + .string "I'm TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C35:: @ 8246C35 - .string "I’ve been running with one {STR_VAR_2}\n" + .string "I've been running with one {STR_VAR_2}\n" .string "that knows how to use {STR_VAR_1}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246C6C:: @ 8246C6C .string "and one {STR_VAR_2} with {STR_VAR_1}!\p" .string "We could be in a tag team.\n" - .string "Wouldn’t that be great?$" + .string "Wouldn't that be great?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246CB3:: @ 8246CB3 .string "Thank you!\p" - .string "I’ll go register us, and that’s\n" + .string "I'll go register us, and that's\n" .string "right now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246CE9:: @ 8246CE9 - .string "Aww, that’s too bad. We would’ve been\n" + .string "Aww, that's too bad. We would've been\n" .string "the toughest tag team around!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D2D:: @ 8246D2D .string "Me?\n" - .string "I’m TUBER {STR_VAR_1}!$" + .string "I'm TUBER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F .string "What do I have with me?\n" @@ -1161,16 +1161,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246D3F:: @ 8246D3F BattleFrontier_BattleTowerMultiBattleRoom_Text_246D6A:: @ 8246D6A .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Hey?\n" - .string "You’ll team up with me, right?$" + .string "You'll team up with me, right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246D9E:: @ 8246D9E .string "Okay!\p" - .string "I’ll go register!\n" - .string "Let’s be excellent together!$" + .string "I'll go register!\n" + .string "Let's be excellent together!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246DD3:: @ 8246DD3 .string "My POKéMON are tough for sure…\n" - .string "It’s too bad you don’t want to team up.$" + .string "It's too bad you don't want to team up.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246E1A:: @ 8246E1A .string "Yay-hey!\n" @@ -1183,15 +1183,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_246E39:: @ 8246E39 BattleFrontier_BattleTowerMultiBattleRoom_Text_246E64:: @ 8246E64 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Yay-hey! Pretty wild, huh?\n" - .string "We’ll have to do a duet in a tag team!$" + .string "We'll have to do a duet in a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246EB6:: @ 8246EB6 .string "Yay-hey! Right on!\n" - .string "I’ll do that registration stuff now!$" + .string "I'll do that registration stuff now!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246EEE:: @ 8246EEE .string "My POKéMON rock hard!\n" - .string "You’ll be sorry, I tell you!$" + .string "You'll be sorry, I tell you!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_246F21:: @ 8246F21 .string "Pleased to meet you.\n" @@ -1216,8 +1216,8 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247013:: @ 8247013 .string "opportunity…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24705B:: @ 824705B - .string "Hello, I’m {STR_VAR_1},\n" - .string "and I’m a POKéFAN.$" + .string "Hello, I'm {STR_VAR_1},\n" + .string "and I'm a POKéFAN.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D .string "I have with me now one {STR_VAR_2}\n" @@ -1226,22 +1226,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24707D:: @ 824707D BattleFrontier_BattleTowerMultiBattleRoom_Text_2470B2:: @ 82470B2 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" .string "Do you like what you see?\n" - .string "Why don’t you be my tag partner?$" + .string "Why don't you be my tag partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2470FD:: @ 82470FD .string "Thank you!\n" - .string "I’ll look after the registration!$" + .string "I'll look after the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24712A:: @ 824712A .string "My POKéMON are top grade…\n" - .string "It’s too bad you can’t appreciate that.$" + .string "It's too bad you can't appreciate that.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24716C:: @ 824716C .string "Hm!\n" .string "I am {STR_VAR_1}, and an EXPERT am I!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24718D:: @ 824718D - .string "The POKéMON that I’ve toughened up are\n" + .string "The POKéMON that I've toughened up are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2471C7:: @ 82471C7 @@ -1259,30 +1259,30 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247238:: @ 8247238 BattleFrontier_BattleTowerMultiBattleRoom_Text_247268:: @ 8247268 .string "Hello, hello.\n" - .string "I’m {STR_VAR_1}, and I’m an EXPERT.$" + .string "I'm {STR_VAR_1}, and I'm an EXPERT.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247291:: @ 8247291 - .string "I’ve raised my POKéMON thoroughly.\n" + .string "I've raised my POKéMON thoroughly.\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2472C7:: @ 82472C7 .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re what I have.\p" - .string "Wouldn’t you like to team up with me?$" + .string "they're what I have.\p" + .string "Wouldn't you like to team up with me?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247313:: @ 8247313 .string "Good, good.\n" - .string "I’ll see to the registration right away.$" + .string "I'll see to the registration right away.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247348:: @ 8247348 .string "Perhaps we can form a team the next\n" .string "time we meet.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24737A:: @ 824737A - .string "I’m DRAGON TAMER {STR_VAR_1}!$" + .string "I'm DRAGON TAMER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24738F:: @ 824738F - .string "The team I’ve been toughening up is\n" + .string "The team I've been toughening up is\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 @@ -1291,15 +1291,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2473C6:: @ 82473C6 .string "Want to be my partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2473FB:: @ 82473FB - .string "Okay, I’ll give it my best!\n" - .string "I’ll go register now, all right?$" + .string "Okay, I'll give it my best!\n" + .string "I'll go register now, all right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247438:: @ 8247438 - .string "You’re not going to find many tougher\n" + .string "You're not going to find many tougher\n" .string "partners than me!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247470:: @ 8247470 - .string "I’m BIRD KEEPER {STR_VAR_1}!$" + .string "I'm BIRD KEEPER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 .string "What POKéMON do I have?\n" @@ -1307,19 +1307,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247484:: @ 8247484 BattleFrontier_BattleTowerMultiBattleRoom_Text_2474AF:: @ 82474AF .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Don’t you think we’d make a decent\n" + .string "Don't you think we'd make a decent\n" .string "tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2474EC:: @ 82474EC .string "Great, thanks!\n" - .string "I’ll look after the registration!$" + .string "I'll look after the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24751D:: @ 824751D .string "My POKéMON and I are strong.\n" .string "What a letdown.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24754A:: @ 824754A - .string "I’m NINJA BOY {STR_VAR_1}!$" + .string "I'm NINJA BOY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C .string "My POKéMON team consists of one\n" @@ -1327,19 +1327,19 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24755C:: @ 824755C BattleFrontier_BattleTowerMultiBattleRoom_Text_24758B:: @ 824758B .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Let’s be in a tag team together!$" + .string "Let's be in a tag team together!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2475BC:: @ 82475BC .string "Yay!\n" .string "Let me go register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2475D5:: @ 82475D5 - .string "You’ll regret not having my tough\n" + .string "You'll regret not having my tough\n" .string "POKéMON on your side!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24760D:: @ 824760D .string "Hello!\n" - .string "I’m PARASOL LADY {STR_VAR_1}!$" + .string "I'm PARASOL LADY {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 .string "Escorting me now are my {STR_VAR_2}\n" @@ -1348,13 +1348,13 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247629:: @ 8247629 BattleFrontier_BattleTowerMultiBattleRoom_Text_247655:: @ 8247655 .string "one {STR_VAR_2} that uses\n" .string "{STR_VAR_1}.\p" - .string "Aren’t they nice?\n" + .string "Aren't they nice?\n" .string "Care to join us in a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24769B:: @ 824769B .string "Thanks a bunch!\p" - .string "I’ll go register at the counter.\n" - .string "Let’s not disappoint each other!$" + .string "I'll go register at the counter.\n" + .string "Let's not disappoint each other!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED .string "My POKéMON are tremendously strong.\n" @@ -1362,7 +1362,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2476ED:: @ 82476ED BattleFrontier_BattleTowerMultiBattleRoom_Text_247724:: @ 8247724 .string "Hello.\n" - .string "I’m {STR_VAR_1}, and I’m a BUG MANIAC!$" + .string "I'm {STR_VAR_1}, and I'm a BUG MANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247749:: @ 8247749 .string "I have found my POKéMON, yes.\n" @@ -1377,15 +1377,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24777A:: @ 824777A BattleFrontier_BattleTowerMultiBattleRoom_Text_2477CE:: @ 82477CE .string "Okay!\n" .string "Understood!\p" - .string "I won’t be long with the registration!$" + .string "I won't be long with the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247807:: @ 8247807 - .string "With the POKéMON I found, we wouldn’t\n" + .string "With the POKéMON I found, we wouldn't\n" .string "have lost…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247838:: @ 8247838 .string "Ahoy, there!\n" - .string "I’m SAILOR {STR_VAR_1}!$" + .string "I'm SAILOR {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 .string "Let me show you my pride and joy!\n" @@ -1393,20 +1393,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247854:: @ 8247854 BattleFrontier_BattleTowerMultiBattleRoom_Text_247889:: @ 8247889 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Of course you’re not going to turn\n" + .string "Of course you're not going to turn\n" .string "me down. We will team up, right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2478DD:: @ 82478DD - .string "I didn’t expect any less!\n" - .string "I’ll go register now.$" + .string "I didn't expect any less!\n" + .string "I'll go register now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24790D:: @ 824790D - .string "We would’ve stormed through\n" + .string "We would've stormed through\n" .string "the opposition! Too bad!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247942:: @ 8247942 - .string "Hi, I’m {STR_VAR_1}.\n" - .string "I’m a COLLECTOR.$" + .string "Hi, I'm {STR_VAR_1}.\n" + .string "I'm a COLLECTOR.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24795F:: @ 824795F .string "The jewels in my collection are\n" @@ -1419,16 +1419,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247991:: @ 8247991 BattleFrontier_BattleTowerMultiBattleRoom_Text_2479CE:: @ 82479CE .string "Oh, yeah!\p" - .string "Well, let’s not waste any time.\n" - .string "I’ll go register the two of us.$" + .string "Well, let's not waste any time.\n" + .string "I'll go register the two of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A18:: @ 8247A18 - .string "Well, that’s upsetting.\n" - .string "You don’t appreciate my POKéMON.$" + .string "Well, that's upsetting.\n" + .string "You don't appreciate my POKéMON.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A51:: @ 8247A51 - .string "Howdy, I’m {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER.$" + .string "Howdy, I'm {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 .string "Keeping me company are one\n" @@ -1436,20 +1436,20 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247A76:: @ 8247A76 BattleFrontier_BattleTowerMultiBattleRoom_Text_247AA1:: @ 8247AA1 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "Don’t you think we’d make an impressive\n" + .string "Don't you think we'd make an impressive\n" .string "tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247AE3:: @ 8247AE3 - .string "That’s super!\n" - .string "I’ll deal with the registration now.$" + .string "That's super!\n" + .string "I'll deal with the registration now.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B16:: @ 8247B16 .string "Next time, choose my POKéMON,\n" .string "will you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B3E:: @ 8247B3E - .string "My name’s {STR_VAR_1}.\n" - .string "I’m a POKéMON RANGER!$" + .string "My name's {STR_VAR_1}.\n" + .string "I'm a POKéMON RANGER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247B62:: @ 8247B62 .string "Let me tell you about my team. I have\n" @@ -1461,15 +1461,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247B9B:: @ 8247B9B .string "with my little posse?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247BE7:: @ 8247BE7 - .string "We’ll be at our best!\n" - .string "I’ll get the registration done quick!$" + .string "We'll be at our best!\n" + .string "I'll get the registration done quick!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C23:: @ 8247C23 - .string "I hope you’ll choose my POKéMON\n" + .string "I hope you'll choose my POKéMON\n" .string "next time.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C4E:: @ 8247C4E - .string "Pleased to meet you. I’m {STR_VAR_1}.\n" + .string "Pleased to meet you. I'm {STR_VAR_1}.\n" .string "I consider myself an AROMA LADY.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247C8C:: @ 8247C8C @@ -1483,7 +1483,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247CB2:: @ 8247CB2 .string "Would you care to be my partner?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247D07:: @ 8247D07 - .string "I’m honored by your acceptance.\n" + .string "I'm honored by your acceptance.\n" .string "I will go register right this instant.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E @@ -1492,7 +1492,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247D4E:: @ 8247D4E BattleFrontier_BattleTowerMultiBattleRoom_Text_247D97:: @ 8247D97 .string "Want to know who I am?\n" - .string "I’m {STR_VAR_1}, the RUIN MANIAC!$" + .string "I'm {STR_VAR_1}, the RUIN MANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247DC7:: @ 8247DC7 .string "The POKéMON that I have with me are\n" @@ -1504,15 +1504,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247DFE:: @ 8247DFE .string "How about you and I partner up?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247E3E:: @ 8247E3E - .string "That’s a sound decision!\n" - .string "I’ll go do the registration paperwork.$" + .string "That's a sound decision!\n" + .string "I'll go do the registration paperwork.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247E7E:: @ 8247E7E .string "Hmm…\n" .string "I think my POKéMON are tough…$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247EA1:: @ 8247EA1 - .string "I’m COOLTRAINER {STR_VAR_1}!$" + .string "I'm COOLTRAINER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 .string "The POKéMON I have right now are one\n" @@ -1521,22 +1521,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247EB5:: @ 8247EB5 BattleFrontier_BattleTowerMultiBattleRoom_Text_247EE9:: @ 8247EE9 .string "one {STR_VAR_2} with {STR_VAR_1}.\n" .string "Cool, huh?\p" - .string "Don’t you think it’d be pretty cool\n" + .string "Don't you think it'd be pretty cool\n" .string "if we made a tag team?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247F3F:: @ 8247F3F .string "Cool!\n" - .string "I’ll go do the registration in a flash!$" + .string "I'll go do the registration in a flash!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247F6D:: @ 8247F6D - .string "I thought that we’d make just\n" + .string "I thought that we'd make just\n" .string "the greatest team ever.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FA3:: @ 8247FA3 - .string "I’m COOLTRAINER {STR_VAR_1}!$" + .string "I'm COOLTRAINER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FB7:: @ 8247FB7 - .string "The team I’ve been raising has one\n" + .string "The team I've been raising has one\n" .string "{STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 @@ -1546,7 +1546,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_247FE9:: @ 8247FE9 BattleFrontier_BattleTowerMultiBattleRoom_Text_248031:: @ 8248031 .string "Sounds A-OK!\n" - .string "I’d better do the registration.$" + .string "I'd better do the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E .string "I was thinking how we would be\n" @@ -1554,7 +1554,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24805E:: @ 824805E BattleFrontier_BattleTowerMultiBattleRoom_Text_24808D:: @ 824808D .string "Heyo!\n" - .string "I’m {STR_VAR_1}, the POKéMANIAC!$" + .string "I'm {STR_VAR_1}, the POKéMANIAC!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB .string "What does a guy like me have?\n" @@ -1562,21 +1562,21 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2480AB:: @ 82480AB BattleFrontier_BattleTowerMultiBattleRoom_Text_2480DC:: @ 82480DC .string "one {STR_VAR_2} with {STR_VAR_1},\n" - .string "that’s what!\p" - .string "Let’s do it!\n" - .string "We’ll stomp around as a tag team!$" + .string "that's what!\p" + .string "Let's do it!\n" + .string "We'll stomp around as a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248128:: @ 8248128 .string "Good call!\n" - .string "I’ll register the both of us!$" + .string "I'll register the both of us!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248151:: @ 8248151 .string "My POKéMON are brutal!\n" - .string "It’s not my fault if you regret this!$" + .string "It's not my fault if you regret this!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24818E:: @ 824818E .string "Yo, there!\n" - .string "I’m KINDLER {STR_VAR_1}!$" + .string "I'm KINDLER {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2481A9:: @ 82481A9 .string "You know what my training cooked up?\n" @@ -1589,22 +1589,22 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2481E1:: @ 82481E1 BattleFrontier_BattleTowerMultiBattleRoom_Text_248221:: @ 8248221 .string "All right!\n" - .string "I’ll get on with the registration.$" + .string "I'll get on with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24824F:: @ 824824F - .string "Promise you’ll partner up with me\n" + .string "Promise you'll partner up with me\n" .string "the next time we run into each other.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248297:: @ 8248297 - .string "I’m {STR_VAR_1}, and I’m a CAMPER!$" + .string "I'm {STR_VAR_1}, and I'm a CAMPER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2482B1:: @ 82482B1 - .string "I’ve been raising one {STR_VAR_1}-\n" + .string "I've been raising one {STR_VAR_1}-\n" .string "using {STR_VAR_2} and one$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2482DC:: @ 82482DC .string "{STR_VAR_1}-using {STR_VAR_2}.\p" - .string "Do you think it’d be fun to team up?\n" + .string "Do you think it'd be fun to team up?\n" .string "I bet it would be!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248321:: @ 8248321 @@ -1617,10 +1617,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_24833D:: @ 824833D BattleFrontier_BattleTowerMultiBattleRoom_Text_248369:: @ 8248369 .string "Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a PICNICKER!$" + .string "I'm {STR_VAR_1}, and I'm a PICNICKER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24838D:: @ 824838D - .string "The POKéMON I’ve been taking are\n" + .string "The POKéMON I've been taking are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2483C1:: @ 82483C1 @@ -1637,10 +1637,10 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248431:: @ 8248431 .string "some other time.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248467:: @ 8248467 - .string "I’m PSYCHIC {STR_VAR_1}!$" + .string "I'm PSYCHIC {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248477:: @ 8248477 - .string "The twosome I’ve been raising are\n" + .string "The twosome I've been raising are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC @@ -1650,35 +1650,35 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2484AC:: @ 82484AC BattleFrontier_BattleTowerMultiBattleRoom_Text_2484E7:: @ 82484E7 .string "Sure thing!\n" - .string "I’ll take care of the registration!$" + .string "I'll take care of the registration!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248517:: @ 8248517 - .string "If we meet again, that’s when I’d like\n" + .string "If we meet again, that's when I'd like\n" .string "to team up with you.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248553:: @ 8248553 - .string "I’m {STR_VAR_1}.\n" - .string "I’m a PSYCHIC.$" + .string "I'm {STR_VAR_1}.\n" + .string "I'm a PSYCHIC.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24856A:: @ 824856A .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24857D:: @ 824857D .string "one {STR_VAR_2} with {STR_VAR_1}--\n" - .string "they’re my disciples.\p" - .string "Doesn’t the idea of forming a tag-team\n" + .string "they're my disciples.\p" + .string "Doesn't the idea of forming a tag-team\n" .string "partnership intrigue you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2485E5:: @ 82485E5 .string "Thank you.\n" - .string "I’ll go deal with the registration.$" + .string "I'll go deal with the registration.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248614:: @ 8248614 .string "I hope there will be another chance\n" .string "to forge an alliance.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24864E:: @ 824864E - .string "I’m SCHOOL KID {STR_VAR_1}!$" + .string "I'm SCHOOL KID {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248661:: @ 8248661 .string "One {STR_VAR_1}-using {STR_VAR_2}$" @@ -1691,18 +1691,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248671:: @ 8248671 BattleFrontier_BattleTowerMultiBattleRoom_Text_2486C6:: @ 82486C6 .string "Ooh, thank you!\n" - .string "I’ll register at the counter right away!$" + .string "I'll register at the counter right away!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2486FF:: @ 82486FF .string "Please?\n" .string "May I join you the next time?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248725:: @ 8248725 - .string "Hiya! The name’s {STR_VAR_1}!\n" - .string "I’m a POKéMON BREEDER!$" + .string "Hiya! The name's {STR_VAR_1}!\n" + .string "I'm a POKéMON BREEDER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248751:: @ 8248751 - .string "The POKéMON I’ve raised are one\n" + .string "The POKéMON I've raised are one\n" .string "{STR_VAR_1}-using {STR_VAR_2} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248781:: @ 8248781 @@ -1719,48 +1719,48 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_2487F7:: @ 82487F7 .string "all right?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248829:: @ 8248829 - .string "I’m {STR_VAR_1}, and I’m proud to say\n" + .string "I'm {STR_VAR_1}, and I'm proud to say\n" .string "that I am a POKéFAN.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24885B:: @ 824885B - .string "The darling POKéMON I’ve raised are\n" + .string "The darling POKéMON I've raised are\n" .string "one {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248892:: @ 8248892 .string "one {STR_VAR_2} with {STR_VAR_1}.\p" - .string "Aren’t they just the cutest?\n" + .string "Aren't they just the cutest?\n" .string "We ought to make a team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2488D8:: @ 82488D8 .string "Thank you, dear!\n" - .string "I’ll be on my way to register!$" + .string "I'll be on my way to register!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248908:: @ 8248908 .string "My darling POKéMON are the best,\n" - .string "I’ll have you know. How annoying!$" + .string "I'll have you know. How annoying!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24894B:: @ 824894B - .string "Hi, I’m SWIMMER {STR_VAR_1}.$" + .string "Hi, I'm SWIMMER {STR_VAR_1}.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24895F:: @ 824895F .string "One {STR_VAR_1}-using {STR_VAR_2}$" BattleFrontier_BattleTowerMultiBattleRoom_Text_24896F:: @ 824896F .string "and one {STR_VAR_1}-using\n" - .string "{STR_VAR_2} are what I’ve trained.\p" - .string "You and me, let’s make a tag team.$" + .string "{STR_VAR_2} are what I've trained.\p" + .string "You and me, let's make a tag team.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2489BD:: @ 82489BD - .string "That’s cool!\n" - .string "I’ll register the two of us.$" + .string "That's cool!\n" + .string "I'll register the two of us.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_2489E7:: @ 82489E7 .string "If we meet again, you owe me\n" .string "a tag team!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248A10:: @ 8248A10 - .string "What’s happening?\n" - .string "I’m {STR_VAR_1}, and I’m a TRIATHLETE.$" + .string "What's happening?\n" + .string "I'm {STR_VAR_1}, and I'm a TRIATHLETE.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 .string "I got a couple decent POKéMON.\n" @@ -1768,7 +1768,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248A40:: @ 8248A40 BattleFrontier_BattleTowerMultiBattleRoom_Text_248A72:: @ 8248A72 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" - .string "It’d be neat if we made a tag team\n" + .string "It'd be neat if we made a tag team\n" .string "together, so how about it?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 @@ -1776,47 +1776,47 @@ BattleFrontier_BattleTowerMultiBattleRoom_Text_248AC0:: @ 8248AC0 .string "You wait while I register, okay?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248AEB:: @ 8248AEB - .string "I expect you’ll let me join you\n" - .string "next time, how’s that?$" + .string "I expect you'll let me join you\n" + .string "next time, how's that?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B22:: @ 8248B22 - .string "I’m the TRIATHLETE {STR_VAR_1}!$" + .string "I'm the TRIATHLETE {STR_VAR_1}!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B39:: @ 8248B39 .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248B4C:: @ 8248B4C .string "another {STR_VAR_2} that knows how\n" - .string "to use {STR_VAR_1}. That’s my pair.\p" + .string "to use {STR_VAR_1}. That's my pair.\p" .string "What do you think?\n" - .string "We’d make a good team, I’d say.$" + .string "We'd make a good team, I'd say.$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248BB4:: @ 8248BB4 .string "I like that answer!\n" - .string "I’ll get done with registration fast!$" + .string "I'll get done with registration fast!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248BEE:: @ 8248BEE - .string "You’ll give me another chance to form\n" - .string "a partnership, won’t you?$" + .string "You'll give me another chance to form\n" + .string "a partnership, won't you?$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C2E:: @ 8248C2E .string "Hi, there! Hello!\n" - .string "I’m {STR_VAR_1}, and I’m a SWIMMER!$" + .string "I'm {STR_VAR_1}, and I'm a SWIMMER!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C5B:: @ 8248C5B - .string "Check out what I’ve been raising!\n" + .string "Check out what I've been raising!\n" .string "One {STR_VAR_2} with {STR_VAR_1} and$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248C90:: @ 8248C90 .string "one {STR_VAR_2} with {STR_VAR_1}!\p" .string "Sweet, huh?\n" - .string "It’d be sweet to form a team, too!$" + .string "It'd be sweet to form a team, too!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248CCF:: @ 8248CCF .string "Much obliged!\n" - .string "I’ll get this registration thing done!$" + .string "I'll get this registration thing done!$" BattleFrontier_BattleTowerMultiBattleRoom_Text_248D04:: @ 8248D04 .string "If we meet again, you have to team up\n" - .string "with me. You’ll do that, right?$" + .string "with me. You'll do that, right?$" diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index ba8ca0cb6..ea1ae17a0 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -22,11 +22,11 @@ BattleFrontier_Lounge1_EventScript_25E792:: @ 825E792 end BattleFrontier_Lounge1_EventScript_25E7AD:: @ 825E7AD - msgbox BattleFrontier_Lounge1_Text_25E95F, 4 + msgbox BattleFrontier_Lounge1_Text_25E95F, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7B6:: @ 825E7B6 - msgbox BattleFrontier_Lounge1_Text_25EEF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EEF6, MSGBOX_DEFAULT return BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF @@ -45,7 +45,7 @@ BattleFrontier_Lounge1_EventScript_25E7BF:: @ 825E7BF end BattleFrontier_Lounge1_EventScript_25E7FF:: @ 825E7FF - msgbox BattleFrontier_Lounge1_Text_25EF5E, 4 + msgbox BattleFrontier_Lounge1_Text_25EF5E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E792 end @@ -80,86 +80,86 @@ BattleFrontier_Lounge1_EventScript_25E87D:: @ 825E87D end BattleFrontier_Lounge1_EventScript_25E87F:: @ 825E87F - msgbox BattleFrontier_Lounge1_Text_25EA92, 4 + msgbox BattleFrontier_Lounge1_Text_25EA92, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E88D:: @ 825E88D - msgbox BattleFrontier_Lounge1_Text_25EAD9, 4 + msgbox BattleFrontier_Lounge1_Text_25EAD9, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E89B:: @ 825E89B - msgbox BattleFrontier_Lounge1_Text_25EB2A, 4 + msgbox BattleFrontier_Lounge1_Text_25EB2A, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8A9:: @ 825E8A9 - msgbox BattleFrontier_Lounge1_Text_25EB6F, 4 + msgbox BattleFrontier_Lounge1_Text_25EB6F, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E80D end BattleFrontier_Lounge1_EventScript_25E8B7:: @ 825E8B7 - msgbox BattleFrontier_Lounge1_Text_25EBBB, 4 + msgbox BattleFrontier_Lounge1_Text_25EBBB, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8C5:: @ 825E8C5 - msgbox BattleFrontier_Lounge1_Text_25EBF8, 4 + msgbox BattleFrontier_Lounge1_Text_25EBF8, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8D3:: @ 825E8D3 - msgbox BattleFrontier_Lounge1_Text_25EC39, 4 + msgbox BattleFrontier_Lounge1_Text_25EC39, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8E1:: @ 825E8E1 - msgbox BattleFrontier_Lounge1_Text_25ED0E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED0E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8EF:: @ 825E8EF - msgbox BattleFrontier_Lounge1_Text_25EC7B, 4 + msgbox BattleFrontier_Lounge1_Text_25EC7B, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E8FD:: @ 825E8FD - msgbox BattleFrontier_Lounge1_Text_25ECC4, 4 + msgbox BattleFrontier_Lounge1_Text_25ECC4, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E850 end BattleFrontier_Lounge1_EventScript_25E90B:: @ 825E90B - msgbox BattleFrontier_Lounge1_Text_25ED4E, 4 + msgbox BattleFrontier_Lounge1_Text_25ED4E, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E919:: @ 825E919 - msgbox BattleFrontier_Lounge1_Text_25ED87, 4 + msgbox BattleFrontier_Lounge1_Text_25ED87, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E927:: @ 825E927 - msgbox BattleFrontier_Lounge1_Text_25EDC1, 4 + msgbox BattleFrontier_Lounge1_Text_25EDC1, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E935:: @ 825E935 - msgbox BattleFrontier_Lounge1_Text_25EDF6, 4 + msgbox BattleFrontier_Lounge1_Text_25EDF6, MSGBOX_DEFAULT goto BattleFrontier_Lounge1_EventScript_25E87D end BattleFrontier_Lounge1_EventScript_25E943:: @ 825E943 - msgbox BattleFrontier_Lounge1_Text_25EE37, 4 + msgbox BattleFrontier_Lounge1_Text_25EE37, MSGBOX_DEFAULT release end BattleFrontier_Lounge1_EventScript_25E94D:: @ 825E94D - msgbox BattleFrontier_Lounge1_Text_25EFDD, 2 + msgbox BattleFrontier_Lounge1_Text_25EFDD, MSGBOX_NPC end BattleFrontier_Lounge1_EventScript_25E956:: @ 825E956 - msgbox BattleFrontier_Lounge1_Text_25F020, 2 + msgbox BattleFrontier_Lounge1_Text_25F020, MSGBOX_NPC end BattleFrontier_Lounge1_Text_25E95F: @ 825E95F @@ -167,13 +167,13 @@ BattleFrontier_Lounge1_Text_25E95F: @ 825E95F .string "I am the man they revere as\l" .string "the legendary top POKéMON BREEDER!\p" .string "If you ever become as seasoned as me,\n" - .string "you’ll see the abilities of POKéMON\l" + .string "you'll see the abilities of POKéMON\l" .string "at a glance.\p" - .string "You’re a TRAINER. Doesn’t it interest\n" - .string "you to know your own POKéMON’s\l" + .string "You're a TRAINER. Doesn't it interest\n" + .string "you to know your own POKéMON's\l" .string "abilities?\p" .string "Here!\n" - .string "Let’s have a look at your POKéMON!$" + .string "Let's have a look at your POKéMON!$" BattleFrontier_Lounge1_Text_25EA92: @ 825EA92 .string "…Hmm…\p" @@ -221,19 +221,19 @@ BattleFrontier_Lounge1_Text_25ED0E: @ 825ED0E BattleFrontier_Lounge1_Text_25ED4E: @ 825ED4E .string "That stat is relatively good.\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25ED87: @ 825ED87 .string "That stat is quite impressive.\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EDC1: @ 825EDC1 .string "That stat is outstanding!\n" - .string "…Hm… That’s how I call it.$" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EDF6: @ 825EDF6 - .string "It’s flawless! A thing of perfection!\n" - .string "…Hm… That’s how I call it.$" + .string "It's flawless! A thing of perfection!\n" + .string "…Hm… That's how I call it.$" BattleFrontier_Lounge1_Text_25EE37: @ 825EE37 .string "What?\n" @@ -247,23 +247,23 @@ BattleFrontier_Lounge1_Text_25EEA6: @ 825EEA6 .string "Save it for next time!$" BattleFrontier_Lounge1_Text_25EEF6: @ 825EEF6 - .string "Ah, youngster! Do your POKéMON’s\n" + .string "Ah, youngster! Do your POKéMON's\n" .string "abilities intrigue you?\p" .string "Here, here!\n" - .string "Let’s have a look at your POKéMON!$" + .string "Let's have a look at your POKéMON!$" BattleFrontier_Lounge1_Text_25EF5E: @ 825EF5E - .string "An expert I am, but even I can’t tell\n" + .string "An expert I am, but even I can't tell\n" .string "anything about an unhatched POKéMON!\p" .string "Show me a POKéMON!\n" .string "A POKéMON is what I need to see!$" BattleFrontier_Lounge1_Text_25EFDD: @ 825EFDD .string "He said my POKéMON is outstanding!\n" - .string "I’m glad I raised it carefully!$" + .string "I'm glad I raised it carefully!$" BattleFrontier_Lounge1_Text_25F020: @ 825F020 .string "He said my POKéMON is outstanding!\n" - .string "But I didn’t do anything special\l" + .string "But I didn't do anything special\l" .string "raising it…$" diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index bbb298b5b..a044e3439 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -7,12 +7,12 @@ BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 checkflag FLAG_0x154 goto_eq BattleFrontier_Lounge2_EventScript_26065F setflag FLAG_0x154 - msgbox BattleFrontier_Lounge2_Text_260766, 4 + msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end BattleFrontier_Lounge2_EventScript_26065F:: @ 826065F - msgbox BattleFrontier_Lounge2_Text_260857, 4 + msgbox BattleFrontier_Lounge2_Text_260857, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end @@ -48,11 +48,11 @@ BattleFrontier_Lounge2_EventScript_26066D:: @ 826066D end BattleFrontier_Lounge2_EventScript_2606F8:: @ 82606F8 - msgbox BattleFrontier_Lounge2_Text_260933, 4 + msgbox BattleFrontier_Lounge2_Text_260933, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_260701:: @ 8260701 - msgbox BattleFrontier_Lounge2_Text_2608F2, 4 + msgbox BattleFrontier_Lounge2_Text_2608F2, MSGBOX_DEFAULT return BattleFrontier_Lounge2_EventScript_26070A:: @ 826070A @@ -97,34 +97,34 @@ BattleFrontier_Lounge2_EventScript_260737:: @ 8260737 BattleFrontier_Lounge2_EventScript_26073C:: @ 826073C lock - msgbox BattleFrontier_Lounge2_Text_261C9C, 4 + msgbox BattleFrontier_Lounge2_Text_261C9C, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260747:: @ 8260747 lock - msgbox BattleFrontier_Lounge2_Text_261CDC, 4 + msgbox BattleFrontier_Lounge2_Text_261CDC, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_260752:: @ 8260752 lock - msgbox BattleFrontier_Lounge2_Text_261D1D, 4 + msgbox BattleFrontier_Lounge2_Text_261D1D, MSGBOX_DEFAULT release end BattleFrontier_Lounge2_EventScript_26075D:: @ 826075D - msgbox BattleFrontier_Lounge2_Text_261D5C, 2 + msgbox BattleFrontier_Lounge2_Text_261D5C, MSGBOX_NPC end BattleFrontier_Lounge2_Text_260766:: @ 8260766 .string "Howdy! When it comes to news about\n" - .string "the BATTLE FRONTIER, I’m no. 1.\p" + .string "the BATTLE FRONTIER, I'm no. 1.\p" .string "You can think of me as\n" .string "the FRONTIER MANIAC.\p" .string "Just checking, but you are a TRAINER,\n" - .string "isn’t that right?\p" - .string "I’ll happily share the hottest news\n" + .string "isn't that right?\p" + .string "I'll happily share the hottest news\n" .string "I gathered about the BATTLE FRONTIER.$" BattleFrontier_Lounge2_Text_260857:: @ 8260857 @@ -133,29 +133,29 @@ BattleFrontier_Lounge2_Text_260857:: @ 8260857 BattleFrontier_Lounge2_Text_2608A1:: @ 82608A1 .string "Well? Well? Well?\p" - .string "I’m sure my information’s been\n" + .string "I'm sure my information's been\n" .string "seriously useful to you, right?$" BattleFrontier_Lounge2_Text_2608F2:: @ 82608F2 - .string "Let’s see now…\p" + .string "Let's see now…\p" .string "It sounds like the {STR_VAR_1}\n" .string "is the hottest place going.$" BattleFrontier_Lounge2_Text_260933:: @ 8260933 - .string "Let’s see now…\p" + .string "Let's see now…\p" .string "It sounds like BATTLE TOWER\n" .string "{STR_VAR_1} is the hottest.$" BattleFrontier_Lounge2_Text_260971:: @ 8260971 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this mysterious TRAINER called\n" + .string "It's this mysterious TRAINER called\n" .string "the SALON MAIDEN that runs the place.$" BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E .string "Have you battled the SALON MAIDEN?\p" - .string "When she’s measuring up her opponent,\n" + .string "When she's measuring up her opponent,\n" .string "she apparently uses these POKéMON:\p" .string "A PSYCHIC-type PSI POKéMON,\n" .string "a FIRE-type VOLCANO POKéMON,\l" @@ -163,23 +163,23 @@ BattleFrontier_Lounge2_Text_260A1E:: @ 8260A1E BattleFrontier_Lounge2_Text_260AE7:: @ 8260AE7 .string "Have you battled the SALON MAIDEN\n" - .string "when she’s serious?\p" - .string "When she’s battling flat out,\n" + .string "when she's serious?\p" + .string "When she's battling flat out,\n" .string "she apparently uses these POKéMON:\p" .string "A DRAGON & PSYCHIC EON POKéMON,\n" .string "an ELECTRIC-type THUNDER POKéMON,\l" .string "and a NORMAL-type SLEEPING POKéMON.$" BattleFrontier_Lounge2_Text_260BC4:: @ 8260BC4 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this flamboyant TRAINER called\n" + .string "It's this flamboyant TRAINER called\n" .string "the DOME ACE that runs the place.$" BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D .string "Have you battled the DOME ACE?\p" - .string "When he’s treating the opponent\n" + .string "When he's treating the opponent\n" .string "lightly, he uses these three POKéMON:\p" .string "A DRAGON & FLYING DRAGON POKéMON,\n" .string "a WATER & GROUND MUD FISH POKéMON,\l" @@ -187,8 +187,8 @@ BattleFrontier_Lounge2_Text_260C6D:: @ 8260C6D BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A .string "Have you battled the DOME ACE\n" - .string "when he’s serious?\p" - .string "When he’s demonstrating his strategy,\n" + .string "when he's serious?\p" + .string "When he's demonstrating his strategy,\n" .string "he uses these three POKéMON:\p" .string "A DRAGON & FLYING EON POKéMON,\n" .string "a WATER & GROUND MUD FISH POKéMON,\l" @@ -196,10 +196,10 @@ BattleFrontier_Lounge2_Text_260D3A:: @ 8260D3A .string "POKéMON.$" BattleFrontier_Lounge2_Text_260E1E:: @ 8260E1E - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this freaky TRAINER called\n" + .string "It's this freaky TRAINER called\n" .string "the FACTORY HEAD that runs the place.$" BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 @@ -212,23 +212,23 @@ BattleFrontier_Lounge2_Text_260EC7:: @ 8260EC7 BattleFrontier_Lounge2_Text_260F74:: @ 8260F74 .string "Have you battled the FACTORY HEAD\n" - .string "when he’s serious?\p" + .string "when he's serious?\p" .string "When he goes seriously to battle,\n" .string "he still gets three rental POKéMON.\p" .string "He battles under virtually the same\n" .string "conditions as you.$" BattleFrontier_Lounge2_Text_261026:: @ 8261026 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this scary TRAINER called\n" + .string "It's this scary TRAINER called\n" .string "the PIKE QUEEN that runs the place.$" BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC .string "Have you battled the PIKE QUEEN\n" .string "before?\p" - .string "When she’s in a good mood, they say\n" + .string "When she's in a good mood, they say\n" .string "she uses these three POKéMON:\p" .string "A POISON-type FANG SNAKE POKéMON,\n" .string "a BUG & ROCK MOLD POKéMON,\l" @@ -236,8 +236,8 @@ BattleFrontier_Lounge2_Text_2610CC:: @ 82610CC BattleFrontier_Lounge2_Text_261194:: @ 8261194 .string "Have you battled the PIKE QUEEN\n" - .string "when she’s serious?\p" - .string "When she’s seriously annoyed, they say\n" + .string "when she's serious?\p" + .string "When she's seriously annoyed, they say\n" .string "she uses these three POKéMON:\p" .string "A POISON-type FANG SNAKE POKéMON,\n" .string "a STEEL & GROUND IRON SNAKE POKéMON,\l" @@ -245,16 +245,16 @@ BattleFrontier_Lounge2_Text_261194:: @ 8261194 .string "POKéMON.$" BattleFrontier_Lounge2_Text_261282:: @ 8261282 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this cute TRAINER called\n" + .string "It's this cute TRAINER called\n" .string "the ARENA TYCOON that runs the place.$" BattleFrontier_Lounge2_Text_261329:: @ 8261329 .string "Have you battled the ARENA TYCOON\n" .string "before?\p" - .string "When she’s assessing the foe’s ability,\n" + .string "When she's assessing the foe's ability,\n" .string "she supposedly uses these POKéMON:\p" .string "A BUG & FIGHTING SINGLE HORN POKéMON,\n" .string "a DARK-type MOONLIGHT POKéMON,\l" @@ -262,7 +262,7 @@ BattleFrontier_Lounge2_Text_261329:: @ 8261329 BattleFrontier_Lounge2_Text_261403:: @ 8261403 .string "Have you battled the ARENA TYCOON\n" - .string "when she’s serious?\p" + .string "when she's serious?\p" .string "When she battles for keeps,\n" .string "she supposedly uses these POKéMON:\p" .string "A DARK-type MOONLIGHT POKéMON,\n" @@ -271,41 +271,41 @@ BattleFrontier_Lounge2_Text_261403:: @ 8261403 .string "MUSHROOM POKéMON.$" BattleFrontier_Lounge2_Text_2614E6:: @ 82614E6 - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this sinister TRAINER called\n" + .string "It's this sinister TRAINER called\n" .string "the PALACE MAVEN that runs the place.$" BattleFrontier_Lounge2_Text_261591:: @ 8261591 .string "Have you battled the PALACE MAVEN\n" .string "before?\p" - .string "When he’s testing the opponent’s\n" - .string "spirit, he’s said to use these POKéMON:\p" + .string "When he's testing the opponent's\n" + .string "spirit, he's said to use these POKéMON:\p" .string "A POISON & FLYING-type BAT POKéMON,\n" .string "a NORMAL-type LAZY POKéMON, and a\l" .string "WATER- & ICE-type TRANSPORT POKéMON.$" BattleFrontier_Lounge2_Text_26166F:: @ 826166F .string "Have you battled the PALACE MAVEN\n" - .string "when he’s serious?\p" + .string "when he's serious?\p" .string "When he throws his entire might into\n" - .string "battle, he’s said to use these POKéMON:\p" + .string "battle, he's said to use these POKéMON:\p" .string "A FIRE-type LEGENDARY POKéMON,\n" .string "a NORMAL-type LAZY POKéMON,\l" .string "and a WATER-type AURORA POKéMON.$" BattleFrontier_Lounge2_Text_26174D:: @ 826174D - .string "Bet you didn’t know this!\p" + .string "Bet you didn't know this!\p" .string "One of those top TRAINERS that SCOTT\n" .string "calls the FRONTIER BRAINS is there.\p" - .string "It’s this fiery-hot TRAINER called\n" + .string "It's this fiery-hot TRAINER called\n" .string "the PYRAMID KING that runs the place.$" BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 .string "Have you battled the PYRAMID KING\n" .string "before?\p" - .string "When he’s checking the foe’s power,\n" + .string "When he's checking the foe's power,\n" .string "he apparently uses these POKéMON:\p" .string "A ROCK-type ROCK PEAK POKéMON,\n" .string "an ICE-type ICEBERG POKéMON,\l" @@ -313,8 +313,8 @@ BattleFrontier_Lounge2_Text_2617F9:: @ 82617F9 BattleFrontier_Lounge2_Text_2618C4:: @ 82618C4 .string "Have you battled the PYRAMID KING\n" - .string "when he’s serious?\p" - .string "When he’s pumped with hot power,\n" + .string "when he's serious?\p" + .string "When he's pumped with hot power,\n" .string "he apparently uses these POKéMON:\p" .string "An ICE & FLYING FREEZE POKéMON, an\n" .string "ELECTRIC & FLYING ELECTRIC POKéMON,\l" @@ -326,7 +326,7 @@ BattleFrontier_Lounge2_Text_2619AC:: @ 82619AC .string "you can enter DOUBLE BATTLES.\p" .string "But the DOUBLE BATTLE ROOMS of\n" .string "the BATTLE TOWER are, like, basic!\p" - .string "They’re where you should learn about\n" + .string "They're where you should learn about\n" .string "how DOUBLE BATTLES are played here\l" .string "in the BATTLE FRONTIER.$" @@ -337,7 +337,7 @@ BattleFrontier_Lounge2_Text_261A91:: @ 8261A91 .string "DOUBLE BATTLES.$" BattleFrontier_Lounge2_Text_261B0C:: @ 8261B0C - .string "Once you’re confident and comfortable\n" + .string "Once you're confident and comfortable\n" .string "with DOUBLE BATTLES here, you should\l" .string "think about challenging other places\l" .string "offering DOUBLE BATTLES.$" @@ -350,24 +350,24 @@ BattleFrontier_Lounge2_Text_261B95:: @ 8261B95 .string "You should look carefully!$" BattleFrontier_Lounge2_Text_261C1A:: @ 8261C1A - .string "If you’re with a friend, head for the\n" + .string "If you're with a friend, head for the\n" .string "LINK MULTI BATTLE ROOM.\p" .string "If you play with a strong friend,\n" .string "you can expect to see tough foes!$" BattleFrontier_Lounge2_Text_261C9C:: @ 8261C9C .string "What amazing news-gathering power!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261CDC:: @ 8261CDC .string "What amazing powers of observation!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261D1D:: @ 8261D1D .string "What amazing power of persuasion!\n" - .string "My mentor’s like none other!$" + .string "My mentor's like none other!$" BattleFrontier_Lounge2_Text_261D5C:: @ 8261D5C .string "…What is this place?\n" - .string "It’s scaring me…$" + .string "It's scaring me…$" diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 2638541b2..26cbeebcf 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 compare VAR_0x8004, 2 goto_if 3, BattleFrontier_Lounge3_EventScript_261EEB setflag FLAG_0x157 - msgbox BattleFrontier_Lounge3_Text_262061, 4 + msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF end @@ -18,10 +18,10 @@ BattleFrontier_Lounge3_EventScript_261DAF:: @ 8261DAF special sub_813A820 waitmessage waitbuttonpress - msgbox BattleFrontier_Lounge3_Text_262A60, 5 + msgbox BattleFrontier_Lounge3_Text_262A60, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 - msgbox BattleFrontier_Lounge3_Text_262ABD, 5 + msgbox BattleFrontier_Lounge3_Text_262ABD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge3_EventScript_261FA5 message BattleFrontier_Lounge3_Text_262B42 @@ -60,7 +60,7 @@ BattleFrontier_Lounge3_EventScript_261E51:: @ 8261E51 specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge3_EventScript_261E75 - msgbox BattleFrontier_Lounge3_Text_262B6E, 4 + msgbox BattleFrontier_Lounge3_Text_262B6E, MSGBOX_DEFAULT message BattleFrontier_Lounge3_Text_262B42 waitmessage goto BattleFrontier_Lounge3_EventScript_261DE9 @@ -72,7 +72,7 @@ BattleFrontier_Lounge3_EventScript_261E75:: @ 8261E75 setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 special sub_813A8FC playse SE_REGI - msgbox BattleFrontier_Lounge3_Text_262BE0, 4 + msgbox BattleFrontier_Lounge3_Text_262BE0, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261E96 end @@ -107,12 +107,12 @@ BattleFrontier_Lounge3_EventScript_261EE5:: @ 8261EE5 return BattleFrontier_Lounge3_EventScript_261EEB:: @ 8261EEB - msgbox BattleFrontier_Lounge3_Text_261FFE, 4 + msgbox BattleFrontier_Lounge3_Text_261FFE, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261EF9:: @ 8261EF9 - msgbox BattleFrontier_Lounge3_Text_26346B, 4 + msgbox BattleFrontier_Lounge3_Text_26346B, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_PLACED_BET_F, 1 goto_if 4, BattleFrontier_Lounge3_EventScript_261F12 goto BattleFrontier_Lounge3_EventScript_261DAF @@ -127,7 +127,7 @@ BattleFrontier_Lounge3_EventScript_261F12:: @ 8261F12 end BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E - msgbox BattleFrontier_Lounge3_Text_263334, 4 + msgbox BattleFrontier_Lounge3_Text_263334, MSGBOX_DEFAULT compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 0 call_if 1, BattleFrontier_Lounge3_EventScript_261F80 compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, 1 @@ -136,13 +136,13 @@ BattleFrontier_Lounge3_EventScript_261F2E:: @ 8261F2E call_if 1, BattleFrontier_Lounge3_EventScript_261F94 msgbox BattleFrontier_Lounge3_Text_2633D4, 9 special sub_813A9D0 - msgbox BattleFrontier_Lounge3_Text_2633F2, 4 + msgbox BattleFrontier_Lounge3_Text_2633F2, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end BattleFrontier_Lounge3_EventScript_261F71:: @ 8261F71 - msgbox BattleFrontier_Lounge3_Text_263298, 4 + msgbox BattleFrontier_Lounge3_Text_263298, MSGBOX_DEFAULT setvar VAR_FRONTIER_GAMBLER_PLACED_BET_F, 0 release end @@ -170,7 +170,7 @@ BattleFrontier_Lounge3_EventScript_261F9E:: @ 8261F9E end BattleFrontier_Lounge3_EventScript_261FA5:: @ 8261FA5 - msgbox BattleFrontier_Lounge3_Text_26342D, 4 + msgbox BattleFrontier_Lounge3_Text_26342D, MSGBOX_DEFAULT release end @@ -180,27 +180,27 @@ BattleFrontier_Lounge3_EventScript_261FAF:: @ 8261FAF end BattleFrontier_Lounge3_EventScript_261FB8:: @ 8261FB8 - msgbox BattleFrontier_Lounge3_Text_263545, 2 + msgbox BattleFrontier_Lounge3_Text_263545, MSGBOX_NPC end BattleFrontier_Lounge3_EventScript_261FC1:: @ 8261FC1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26346F, 4 + msgbox BattleFrontier_Lounge3_Text_26346F, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FD1:: @ 8261FD1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_26351D, 4 + msgbox BattleFrontier_Lounge3_Text_26351D, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end BattleFrontier_Lounge3_EventScript_261FE1:: @ 8261FE1 lock faceplayer - msgbox BattleFrontier_Lounge3_Text_2634C9, 4 + msgbox BattleFrontier_Lounge3_Text_2634C9, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261FF1 end @@ -212,9 +212,9 @@ BattleFrontier_Lounge3_EventScript_261FF1:: @ 8261FF1 end BattleFrontier_Lounge3_Text_261FFE:: @ 8261FFE - .string "…What’s that you want?\p" - .string "Can’t you see we’re kind of busy here?\n" - .string "Can’t your business wait till later?$" + .string "…What's that you want?\p" + .string "Can't you see we're kind of busy here?\n" + .string "Can't your business wait till later?$" BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "…Huh?\n" @@ -228,7 +228,7 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "First, we pick one of the facilities\n" .string "in the BATTLE FRONTIER.\p" .string "Then, we each pick a different TRAINER\n" - .string "who’s taking that facility’s challenge,\l" + .string "who's taking that facility's challenge,\l" .string "and bet with our Battle Points.\p" .string "The guy who bet on the TRAINER with\n" .string "the best record takes all the Battle\l" @@ -237,99 +237,99 @@ BattleFrontier_Lounge3_Text_262061:: @ 8262061 .string "So, anyway…$" BattleFrontier_Lounge3_Text_262261:: @ 8262261 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s SINGLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's SINGLE BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26230D:: @ 826230D - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s DOUBLE BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's DOUBLE BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2623B9:: @ 82623B9 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "TOWER’s MULTI BATTLE ROOMS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "TOWER's MULTI BATTLE ROOMS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262464:: @ 8262464 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "DOME’s SINGLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "DOME's SINGLE BATTLE Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26250E:: @ 826250E - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "DOME’s DOUBLE BATTLE Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "DOME's DOUBLE BATTLE Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2625B8:: @ 82625B8 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Single Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "FACTORY's Battle Swap Single Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26266A:: @ 826266A - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "FACTORY’s Battle Swap Double Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "FACTORY's Battle Swap Double Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26271C:: @ 826271C - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "PALACE’s SINGLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PALACE's SINGLE BATTLE HALLS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2627C9:: @ 82627C9 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be challenging the BATTLE\l" - .string "PALACE’s DOUBLE BATTLE HALLS.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PALACE's DOUBLE BATTLE HALLS.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262876:: @ 8262876 - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "ARENA’s Set KO Tourney.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "ARENA's Set KO Tourney.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_26291A:: @ 826291A - .string "What I’m looking for is a TRAINER who’s\n" - .string "going to be entering the BATTLE PIKE’s\l" + .string "What I'm looking for is a TRAINER who's\n" + .string "going to be entering the BATTLE PIKE's\l" .string "Battle Choice.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_2629BC:: @ 82629BC - .string "What I’m looking for is a TRAINER who’s\n" + .string "What I'm looking for is a TRAINER who's\n" .string "going to be entering the BATTLE\l" - .string "PYRAMID’s Battle Quest.\p" - .string "But so far, I haven’t seen a TRAINER\n" + .string "PYRAMID's Battle Quest.\p" + .string "But so far, I haven't seen a TRAINER\n" .string "that has that winning quality.$" BattleFrontier_Lounge3_Text_262A60:: @ 8262A60 - .string "I’ll see to it that you benefit, too.\n" + .string "I'll see to it that you benefit, too.\n" .string "So how about it?\l" .string "How about entering that event for me?$" BattleFrontier_Lounge3_Text_262ABD:: @ 8262ABD - .string "All right, that’s perfect.\n" + .string "All right, that's perfect.\n" .string "So, uh… How about spotting me some\l" .string "of your Battle Points?\p" - .string "Trust me, I’ll show you my gratitude\n" + .string "Trust me, I'll show you my gratitude\n" .string "afterward.$" BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 @@ -338,104 +338,104 @@ BattleFrontier_Lounge3_Text_262B42:: @ 8262B42 BattleFrontier_Lounge3_Text_262B6E:: @ 8262B6E .string "Oh, no, no, no!\n" - .string "You don’t have enough Battle Points!\p" - .string "I wish you wouldn’t monkey around and\n" - .string "waste everyone’s time!$" + .string "You don't have enough Battle Points!\p" + .string "I wish you wouldn't monkey around and\n" + .string "waste everyone's time!$" BattleFrontier_Lounge3_Text_262BE0:: @ 8262BE0 .string "Heheh! Thanks much!\n" .string "So, off you go!$" BattleFrontier_Lounge3_Text_262C04:: @ 8262C04 - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "SINGLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262C90:: @ 8262C90 - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "DOUBLE BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262D1C:: @ 8262D1C - .string "Get to the BATTLE TOWER’s\n" + .string "Get to the BATTLE TOWER's\n" .string "MULTI BATTLE ROOMS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262DA7:: @ 8262DA7 - .string "Get to the BATTLE DOME’s\n" + .string "Get to the BATTLE DOME's\n" .string "SINGLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262E34:: @ 8262E34 - .string "Get to the BATTLE DOME’s\n" + .string "Get to the BATTLE DOME's\n" .string "DOUBLE BATTLE Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262EC1:: @ 8262EC1 - .string "Get to the BATTLE FACTORY’s\n" + .string "Get to the BATTLE FACTORY's\n" .string "Battle Swap Single Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262F56:: @ 8262F56 - .string "Get to the BATTLE FACTORY’s\n" + .string "Get to the BATTLE FACTORY's\n" .string "Battle Swap Double Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_262FEB:: @ 8262FEB - .string "Get to the BATTLE PALACE’s\n" + .string "Get to the BATTLE PALACE's\n" .string "SINGLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263078:: @ 8263078 - .string "Get to the BATTLE PALACE’s\n" + .string "Get to the BATTLE PALACE's\n" .string "DOUBLE BATTLE HALLS pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263105:: @ 8263105 - .string "Get to the BATTLE ARENA’s\n" + .string "Get to the BATTLE ARENA's\n" .string "Set KO Tourney pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_26318C:: @ 826318C - .string "Get to the BATTLE PIKE’s\n" + .string "Get to the BATTLE PIKE's\n" .string "Battle Choice pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263211:: @ 8263211 - .string "Get to the BATTLE PYRAMID’s\n" + .string "Get to the BATTLE PYRAMID's\n" .string "Battle Quest pronto!\p" - .string "It’s a must-win situation!\n" - .string "Don’t blow your chance!\l" + .string "It's a must-win situation!\n" + .string "Don't blow your chance!\l" .string "Both of our futures depend on you!$" BattleFrontier_Lounge3_Text_263298:: @ 8263298 - .string "Oh, it’s you…\n" + .string "Oh, it's you…\n" .string "Nice try…\p" - .string "I hate to break it to you, but I can’t\n" + .string "I hate to break it to you, but I can't\n" .string "return your Battle Points…\p" - .string "I guess we’ll have to let it motivate\n" + .string "I guess we'll have to let it motivate\n" .string "us to try harder next time!$" BattleFrontier_Lounge3_Text_263334:: @ 8263334 @@ -443,8 +443,8 @@ BattleFrontier_Lounge3_Text_263334:: @ 8263334 .string "Hello there, champ!\p" .string "I knew you could!\n" .string "I knew you would!\l" - .string "We’re both big winners!\p" - .string "I’ll return your Battle Points and,\n" + .string "We're both big winners!\p" + .string "I'll return your Battle Points and,\n" .string "of course, a little extra from me!$" BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 @@ -452,11 +452,11 @@ BattleFrontier_Lounge3_Text_2633D4:: @ 82633D4 .string "{STR_VAR_1} Battle Points.$" BattleFrontier_Lounge3_Text_2633F2:: @ 82633F2 - .string "If you’re up for another challenge,\n" + .string "If you're up for another challenge,\n" .string "please do think of me!$" BattleFrontier_Lounge3_Text_26342D:: @ 826342D - .string "Not interested?! You shouldn’t be\n" + .string "Not interested?! You shouldn't be\n" .string "so afraid to take a chance!$" BattleFrontier_Lounge3_Text_26346B:: @ 826346B @@ -469,7 +469,7 @@ BattleFrontier_Lounge3_Text_26346F:: @ 826346F BattleFrontier_Lounge3_Text_2634C9:: @ 82634C9 .string "That TRAINER…\p" - .string "He’s good, but he gets rattled too\n" + .string "He's good, but he gets rattled too\n" .string "easily to survive the BATTLE DOME…$" BattleFrontier_Lounge3_Text_26351D:: @ 826351D diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc index 1108ceee7..407720915 100644 --- a/data/maps/BattleFrontier_Lounge4/scripts.inc +++ b/data/maps/BattleFrontier_Lounge4/scripts.inc @@ -2,24 +2,24 @@ BattleFrontier_Lounge4_MapScripts:: @ 826358C .byte 0 BattleFrontier_Lounge4_EventScript_26358D:: @ 826358D - msgbox BattleFrontier_Lounge4_Text_2635A8, 2 + msgbox BattleFrontier_Lounge4_Text_2635A8, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_263596:: @ 8263596 - msgbox BattleFrontier_Lounge4_Text_2635EC, 2 + msgbox BattleFrontier_Lounge4_Text_2635EC, MSGBOX_NPC end BattleFrontier_Lounge4_EventScript_26359F:: @ 826359F - msgbox BattleFrontier_Lounge4_Text_263625, 2 + msgbox BattleFrontier_Lounge4_Text_263625, MSGBOX_NPC end BattleFrontier_Lounge4_Text_2635A8: @ 82635A8 - .string "I wonder if they’ll be airing interviews\n" + .string "I wonder if they'll be airing interviews\n" .string "with tough TRAINERS today?$" BattleFrontier_Lounge4_Text_2635EC: @ 82635EC .string "If I opened a restaurant here,\n" - .string "it’d make money for sure.$" + .string "it'd make money for sure.$" BattleFrontier_Lounge4_Text_263625: @ 8263625 .string "Whew…\p" diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc index bb1feceec..65a5d2556 100644 --- a/data/maps/BattleFrontier_Lounge5/scripts.inc +++ b/data/maps/BattleFrontier_Lounge5/scripts.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge5_MapScripts:: @ 82645C5 BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 lock faceplayer - msgbox BattleFrontier_Lounge5_Text_264632, 5 + msgbox BattleFrontier_Lounge5_Text_264632, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge5_EventScript_26460D special sub_81B94B0 @@ -23,25 +23,25 @@ BattleFrontier_Lounge5_EventScript_2645C6:: @ 82645C6 end BattleFrontier_Lounge5_EventScript_264603:: @ 8264603 - msgbox BattleFrontier_Lounge5_Text_264EEE, 4 + msgbox BattleFrontier_Lounge5_Text_264EEE, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_26460D:: @ 826460D - msgbox BattleFrontier_Lounge5_Text_26467F, 4 + msgbox BattleFrontier_Lounge5_Text_26467F, MSGBOX_DEFAULT release end BattleFrontier_Lounge5_EventScript_264617:: @ 8264617 - msgbox BattleFrontier_Lounge5_Text_264F22, 2 + msgbox BattleFrontier_Lounge5_Text_264F22, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264620:: @ 8264620 - msgbox BattleFrontier_Lounge5_Text_264F64, 2 + msgbox BattleFrontier_Lounge5_Text_264F64, MSGBOX_NPC end BattleFrontier_Lounge5_EventScript_264629:: @ 8264629 - msgbox BattleFrontier_Lounge5_Text_264FAB, 2 + msgbox BattleFrontier_Lounge5_Text_264FAB, MSGBOX_NPC end BattleFrontier_Lounge5_Text_264632:: @ 8264632 @@ -187,8 +187,8 @@ BattleFrontier_Lounge5_Text_264E8F:: @ 8264E8F .string "it will turn sneaky!$" BattleFrontier_Lounge5_Text_264EEE:: @ 8264EEE - .string "That’s silly! An EGG is asleep!\n" - .string "I can’t talk to it!$" + .string "That's silly! An EGG is asleep!\n" + .string "I can't talk to it!$" BattleFrontier_Lounge5_Text_264F22:: @ 8264F22 .string "How charming!\n" diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index c779e7c76..495a604d4 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox BattleFrontier_Lounge6_Text_26508D, 5 + msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge6_EventScript_26506B special sub_81B94B0 @@ -28,55 +28,55 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED special sub_807EA10 special sub_807F0E4 waitstate - msgbox BattleFrontier_Lounge6_Text_265128, 4 + msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT setflag FLAG_0x09C release end BattleFrontier_Lounge6_EventScript_26506B:: @ 826506B - msgbox BattleFrontier_Lounge6_Text_2651CB, 4 + msgbox BattleFrontier_Lounge6_Text_2651CB, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265075:: @ 8265075 bufferspeciesname 0, VAR_0x8009 - msgbox BattleFrontier_Lounge6_Text_26518D, 4 + msgbox BattleFrontier_Lounge6_Text_26518D, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_EventScript_265083:: @ 8265083 - msgbox BattleFrontier_Lounge6_Text_26520E, 4 + msgbox BattleFrontier_Lounge6_Text_26520E, MSGBOX_DEFAULT release end BattleFrontier_Lounge6_Text_26508D: @ 826508D .string "My POKéMON is a {STR_VAR_2}.\n" .string "Do you know it?\l" - .string "It’s quite cute and rather nice.\p" + .string "It's quite cute and rather nice.\p" .string "This little one, I could trade with\n" .string "pride!\p" .string "Would you like to trade me a {STR_VAR_1}\n" .string "for my {STR_VAR_2}?$" BattleFrontier_Lounge6_Text_265128: @ 8265128 - .string "Oh, it’s adorable!\n" + .string "Oh, it's adorable!\n" .string "Thank you!\l" - .string "I promise I’ll be good to it!\p" - .string "Oh! I hope you’ll be good to\n" + .string "I promise I'll be good to it!\p" + .string "Oh! I hope you'll be good to\n" .string "my {STR_VAR_2}, too!$" BattleFrontier_Lounge6_Text_26518D: @ 826518D - .string "Oh, I’m sorry!\n" - .string "I don’t intend to trade for anything\l" + .string "Oh, I'm sorry!\n" + .string "I don't intend to trade for anything\l" .string "but a {STR_VAR_1}.$" BattleFrontier_Lounge6_Text_2651CB: @ 82651CB - .string "Oh, you won’t?\n" - .string "Well, that’s fine, too.\l" + .string "Oh, you won't?\n" + .string "Well, that's fine, too.\l" .string "Please come visit us again.$" BattleFrontier_Lounge6_Text_26520E: @ 826520E .string "Giggle!\n" .string "A SKITTY is so much cuter than I had\l" - .string "imagined. I’m delighted!$" + .string "imagined. I'm delighted!$" diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 0b810d4f7..f395a27bc 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -7,13 +7,13 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 setvar VAR_TEMP_C, 9 checkflag FLAG_0x15A goto_eq BattleFrontier_Lounge7_EventScript_265276 - msgbox BattleFrontier_Lounge7_Text_2656ED, 4 + msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT setflag FLAG_0x15A goto BattleFrontier_Lounge7_EventScript_265284 end BattleFrontier_Lounge7_EventScript_265276:: @ 8265276 - msgbox BattleFrontier_Lounge7_Text_2658AB, 4 + msgbox BattleFrontier_Lounge7_Text_2658AB, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265284 end @@ -122,13 +122,13 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 setvar VAR_TEMP_C, 10 checkflag FLAG_0x15B goto_eq BattleFrontier_Lounge7_EventScript_265466 - msgbox BattleFrontier_Lounge7_Text_265A6C, 4 + msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT setflag FLAG_0x15B goto BattleFrontier_Lounge7_EventScript_265474 end BattleFrontier_Lounge7_EventScript_265466:: @ 8265466 - msgbox BattleFrontier_Lounge7_Text_265C2C, 4 + msgbox BattleFrontier_Lounge7_Text_265C2C, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_265474 end @@ -234,12 +234,12 @@ BattleFrontier_Lounge7_EventScript_26562A:: @ 826562A BattleFrontier_Lounge7_EventScript_265635:: @ 8265635 special sub_813ADB8 special sub_813A988 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end BattleFrontier_Lounge7_EventScript_265645:: @ 8265645 - msgbox BattleFrontier_Lounge7_Text_265A0E, 4 + msgbox BattleFrontier_Lounge7_Text_265A0E, MSGBOX_DEFAULT release end @@ -249,18 +249,18 @@ BattleFrontier_Lounge7_EventScript_26564F:: @ 826564F special sub_813AC7C buffernumberstring 1, VAR_0x8008 copyvar VAR_0x8004, VAR_TEMP_C - msgbox BattleFrontier_Lounge7_Text_265921, 5 + msgbox BattleFrontier_Lounge7_Text_265921, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_2656CA specialvar VAR_TEMP_1, sub_813AA04 compare VAR_TEMP_1, VAR_0x8008 goto_if 4, BattleFrontier_Lounge7_EventScript_265696 - msgbox BattleFrontier_Lounge7_Text_265997, 4 + msgbox BattleFrontier_Lounge7_Text_265997, MSGBOX_DEFAULT goto BattleFrontier_Lounge7_EventScript_2656CA end BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 - msgbox BattleFrontier_Lounge7_Text_26595A, 4 + msgbox BattleFrontier_Lounge7_Text_26595A, MSGBOX_DEFAULT special sub_813AEB4 fadescreen 1 special sub_813A988 @@ -269,7 +269,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696 waitstate compare VAR_RESULT, 0 goto_eq BattleFrontier_Lounge7_EventScript_265645 - msgbox BattleFrontier_Lounge7_Text_2659C7, 4 + msgbox BattleFrontier_Lounge7_Text_2659C7, MSGBOX_DEFAULT copyvar VAR_0x8004, VAR_0x8008 special sub_813A9A4 release @@ -282,28 +282,28 @@ BattleFrontier_Lounge7_EventScript_2656CA:: @ 82656CA end BattleFrontier_Lounge7_EventScript_2656DB:: @ 82656DB - msgbox BattleFrontier_Lounge7_Text_265C6F, 2 + msgbox BattleFrontier_Lounge7_Text_265C6F, MSGBOX_NPC end BattleFrontier_Lounge7_EventScript_2656E4:: @ 82656E4 - msgbox BattleFrontier_Lounge7_Text_265D17, 2 + msgbox BattleFrontier_Lounge7_Text_265D17, MSGBOX_NPC end BattleFrontier_Lounge7_Text_2656ED: @ 82656ED .string "Buhahaha!\p" - .string "You couldn’t tell it from looking now,\n" + .string "You couldn't tell it from looking now,\n" .string "but I used to be one tough TRAINER.\p" .string "I had a reputation as the toughest\n" .string "BEAUTY around, I tell you!\p" .string "… … … … … …\p" .string "What is it now?\n" - .string "You don’t believe me.\p" - .string "I’m not like that blowhard woman over\n" - .string "there. I’m actually talented!\p" + .string "You don't believe me.\p" + .string "I'm not like that blowhard woman over\n" + .string "there. I'm actually talented!\p" .string "Let me prove it to you.\n" .string "I can teach your POKéMON special and\l" .string "yet cute moves.\p" - .string "But my lessons don’t come free.\n" + .string "But my lessons don't come free.\n" .string "How about paying for the moves I teach\l" .string "with a wee bit of Battle Points?$" @@ -326,33 +326,33 @@ BattleFrontier_Lounge7_Text_26595A: @ 826595A BattleFrontier_Lounge7_Text_265997: @ 8265997 .string "What the…\n" - .string "You haven’t got enough Battle Points!$" + .string "You haven't got enough Battle Points!$" BattleFrontier_Lounge7_Text_2659C7: @ 82659C7 .string "Do you see how skilled I am now?\n" - .string "I’ll take your Battle Points, thanks!$" + .string "I'll take your Battle Points, thanks!$" BattleFrontier_Lounge7_Text_265A0E: @ 8265A0E - .string "What’s that?\n" - .string "You don’t want to…\p" + .string "What's that?\n" + .string "You don't want to…\p" .string "If you want to see how skilled I am,\n" .string "you come see me anytime!$" BattleFrontier_Lounge7_Text_265A6C: @ 8265A6C .string "Ihihihi!\p" - .string "I know it’s hard to see now, but I used\n" + .string "I know it's hard to see now, but I used\n" .string "to be one fantastic TRAINER.\p" .string "I had a reputation as the most\n" .string "invincible SWIMMER around, I tell you!\p" .string "… … … … … …\p" - .string "What’s wrong?\n" - .string "You don’t believe me.\p" - .string "I’m not like that buffoonish woman over\n" - .string "there. I’m actually experienced!\p" + .string "What's wrong?\n" + .string "You don't believe me.\p" + .string "I'm not like that buffoonish woman over\n" + .string "there. I'm actually experienced!\p" .string "I can prove it to you.\n" .string "I can teach your POKéMON hard and\l" .string "yet pretty moves.\p" - .string "But my lessons don’t come free.\n" + .string "But my lessons don't come free.\n" .string "How about paying for the moves I teach\l" .string "with a wee bit of Battle Points?$" @@ -364,31 +364,31 @@ BattleFrontier_Lounge7_Text_265C2C: @ 8265C2C BattleFrontier_Lounge7_Text_265C6F: @ 8265C6F .string "Those ladies, the way they bad-mouth\n" .string "each other, you probably think that\l" - .string "they don’t get along.\p" - .string "But if that were true, they wouldn’t\n" + .string "they don't get along.\p" + .string "But if that were true, they wouldn't\n" .string "stay out here together, would they?$" BattleFrontier_Lounge7_Text_265D17: @ 8265D17 .string "When I was just a wee YOUNGSTER,\n" .string "those ladies were strong and beautiful.\p" .string "They were idols among us TRAINERS.\p" - .string "Even now, age hasn’t dulled their\n" + .string "Even now, age hasn't dulled their\n" .string "abilities.\p" .string "In fact, their POKéMON moves have\n" .string "grown even more polished.\p" - .string "But… For some reason, I can’t help\n" + .string "But… For some reason, I can't help\n" .string "but feel this…\p" .string "Time is so cruel…$" BattleFrontier_Lounge7_Text_265E30:: @ 8265E30 .string "Recovers up to\n" - .string "half the user’s\n" + .string "half the user's\n" .string "maximum HP.$" BattleFrontier_Lounge7_Text_265E5B:: @ 8265E5B .string "Inflicts damage\n" .string "identical to the\n" - .string "user’s level.$" + .string "user's level.$" BattleFrontier_Lounge7_Text_265E8A:: @ 8265E8A .string "Recovers half the\n" @@ -442,7 +442,7 @@ BattleFrontier_Lounge7_Text_26603E:: @ 826603E BattleFrontier_Lounge7_Text_266070:: @ 8266070 .string "Hurls mud in the\n" - .string "foe’s face to re-\n" + .string "foe's face to re-\n" .string "duce its accuracy.$" BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 @@ -453,7 +453,7 @@ BattleFrontier_Lounge7_Text_2660A6:: @ 82660A6 BattleFrontier_Lounge7_Text_2660D0:: @ 82660D0 .string "A chilling attack\n" .string "that lowers the\n" - .string "foe’s SPEED.$" + .string "foe's SPEED.$" BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF .string "Endures any at-\n" @@ -461,7 +461,7 @@ BattleFrontier_Lounge7_Text_2660FF:: @ 82660FF .string "leaving 1HP.$" BattleFrontier_Lounge7_Text_26612D:: @ 826612D - .string "Copies the foe’s\n" + .string "Copies the foe's\n" .string "effect(s) and\n" .string "gives to the user.$" diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc index 35f83baff..3a6f78fd7 100644 --- a/data/maps/BattleFrontier_Lounge8/scripts.inc +++ b/data/maps/BattleFrontier_Lounge8/scripts.inc @@ -2,15 +2,15 @@ BattleFrontier_Lounge8_MapScripts:: @ 82676C9 .byte 0 BattleFrontier_Lounge8_EventScript_2676CA:: @ 82676CA - msgbox BattleFrontier_Lounge8_Text_2676E5, 2 + msgbox BattleFrontier_Lounge8_Text_2676E5, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676D3:: @ 82676D3 - msgbox BattleFrontier_Lounge8_Text_26779C, 2 + msgbox BattleFrontier_Lounge8_Text_26779C, MSGBOX_NPC end BattleFrontier_Lounge8_EventScript_2676DC:: @ 82676DC - msgbox BattleFrontier_Lounge8_Text_26782C, 2 + msgbox BattleFrontier_Lounge8_Text_26782C, MSGBOX_NPC end BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 @@ -22,15 +22,15 @@ BattleFrontier_Lounge8_Text_2676E5: @ 82676E5 .string "Spirit…\l" .string "Bravery…\l" .string "And ability…\p" - .string "Well, I’m all set in every way!\n" - .string "I’ll be unstoppable at every building!\p" + .string "Well, I'm all set in every way!\n" + .string "I'll be unstoppable at every building!\p" .string "Huh? POKéMON?\n" - .string "What’s that?$" + .string "What's that?$" BattleFrontier_Lounge8_Text_26779C: @ 826779C .string "Do you know about the FRONTIER\n" .string "BRAINS?\p" - .string "That’s what SCOTT calls the seven\n" + .string "That's what SCOTT calls the seven\n" .string "special TRAINERS that run the seven\l" .string "facilities in the BATTLE FRONTIER.$" @@ -39,7 +39,7 @@ BattleFrontier_Lounge8_Text_26782C: @ 826782C .string "told me that I have a lot of talent\l" .string "for battling!\p" .string "I like POKéMON CONTESTS more!\p" - .string "But I’m no good at CONTESTS!\p" + .string "But I'm no good at CONTESTS!\p" .string "I guess having talent and liking\n" - .string "something aren’t the same.$" + .string "something aren't the same.$" diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 0b7f5b767..725fce863 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC message gUnknown_08272A21 waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -31,36 +31,36 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 end BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, 2 + msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC end BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock applymovement 2, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, 4 + msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release end BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, 2 + msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC end BattleFrontier_Mart_Text_267B29: @ 8267B29 .string "We came here to chaperon our\n" .string "grandson.\p" - .string "But since we’re here, we thought\n" + .string "But since we're here, we thought\n" .string "we should get some souvenirs.$" BattleFrontier_Mart_Text_267B8F: @ 8267B8F .string "Dear, what do you think of this?\n" - .string "Wouldn’t this make a nice gift?\p" - .string "It’s…PRO…TE…IN?\n" - .string "It sounds delicious, doesn’t it?$" + .string "Wouldn't this make a nice gift?\p" + .string "It's…PRO…TE…IN?\n" + .string "It sounds delicious, doesn't it?$" BattleFrontier_Mart_Text_267C01: @ 8267C01 - .string "A lot of the BATTLE FRONTIER’s\n" - .string "facilities don’t allow the use of items\l" + .string "A lot of the BATTLE FRONTIER's\n" + .string "facilities don't allow the use of items\l" .string "during battles.\p" .string "That rule makes things tougher than\n" .string "they already are!$" diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index febcb05c7..bc154052d 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -27,44 +27,44 @@ BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F return BattleFrontier_OutsideEast_EventScript_242C43:: @ 8242C43 - msgbox BattleFrontier_OutsideEast_Text_242E11, 3 + msgbox BattleFrontier_OutsideEast_Text_242E11, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C4C:: @ 8242C4C - msgbox BattleFrontier_OutsideEast_Text_242E58, 3 + msgbox BattleFrontier_OutsideEast_Text_242E58, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C55:: @ 8242C55 - msgbox BattleFrontier_OutsideEast_Text_242E96, 3 + msgbox BattleFrontier_OutsideEast_Text_242E96, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C5E:: @ 8242C5E - msgbox BattleFrontier_OutsideEast_Text_242ECF, 3 + msgbox BattleFrontier_OutsideEast_Text_242ECF, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242C67:: @ 8242C67 - msgbox BattleFrontier_OutsideEast_Text_242F8C, 2 + msgbox BattleFrontier_OutsideEast_Text_242F8C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C70:: @ 8242C70 - msgbox BattleFrontier_OutsideEast_Text_242FDC, 2 + msgbox BattleFrontier_OutsideEast_Text_242FDC, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C79:: @ 8242C79 - msgbox BattleFrontier_OutsideEast_Text_24308C, 2 + msgbox BattleFrontier_OutsideEast_Text_24308C, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C82:: @ 8242C82 - msgbox BattleFrontier_OutsideEast_Text_243106, 2 + msgbox BattleFrontier_OutsideEast_Text_243106, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C8B:: @ 8242C8B - msgbox BattleFrontier_OutsideEast_Text_2431A5, 2 + msgbox BattleFrontier_OutsideEast_Text_2431A5, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242C94:: @ 8242C94 lock - msgbox BattleFrontier_OutsideEast_Text_2432DD, 4 + msgbox BattleFrontier_OutsideEast_Text_2432DD, MSGBOX_DEFAULT release end @@ -73,35 +73,35 @@ BattleFrontier_OutsideEast_EventScript_242C9F:: @ 8242C9F faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox BattleFrontier_OutsideEast_Text_24334B, 4 + msgbox BattleFrontier_OutsideEast_Text_24334B, MSGBOX_DEFAULT waitmoncry release end BattleFrontier_OutsideEast_EventScript_242CB2:: @ 8242CB2 - msgbox BattleFrontier_OutsideEast_Text_243363, 2 + msgbox BattleFrontier_OutsideEast_Text_243363, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CBB:: @ 8242CBB - msgbox BattleFrontier_OutsideEast_Text_243425, 2 + msgbox BattleFrontier_OutsideEast_Text_243425, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CC4:: @ 8242CC4 - msgbox BattleFrontier_OutsideEast_Text_2434A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2434A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CCD:: @ 8242CCD - msgbox BattleFrontier_OutsideEast_Text_243504, 2 + msgbox BattleFrontier_OutsideEast_Text_243504, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CD6:: @ 8242CD6 lock - msgbox BattleFrontier_OutsideEast_Text_243529, 4 + msgbox BattleFrontier_OutsideEast_Text_243529, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242CE1:: @ 8242CE1 - msgbox BattleFrontier_OutsideEast_Text_243230, 2 + msgbox BattleFrontier_OutsideEast_Text_243230, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA @@ -123,7 +123,7 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC playse 269 applymovement 14, BattleFrontier_OutsideEast_Movement_242D69 waitmovement 0 - msgbox gUnknown_082731BD, 4 + msgbox gUnknown_082731BD, MSGBOX_DEFAULT closemessage waitse playmoncry SPECIES_SUDOWOODO, 2 @@ -169,55 +169,55 @@ BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 - msgbox BattleFrontier_OutsideEast_Text_243598, 2 + msgbox BattleFrontier_OutsideEast_Text_243598, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D82:: @ 8242D82 - msgbox BattleFrontier_OutsideEast_Text_243668, 2 + msgbox BattleFrontier_OutsideEast_Text_243668, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D8B:: @ 8242D8B - msgbox BattleFrontier_OutsideEast_Text_2436F2, 2 + msgbox BattleFrontier_OutsideEast_Text_2436F2, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D94:: @ 8242D94 - msgbox BattleFrontier_OutsideEast_Text_243809, 2 + msgbox BattleFrontier_OutsideEast_Text_243809, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242D9D:: @ 8242D9D - msgbox BattleFrontier_OutsideEast_Text_243895, 2 + msgbox BattleFrontier_OutsideEast_Text_243895, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DA6:: @ 8242DA6 - msgbox BattleFrontier_OutsideEast_Text_243943, 2 + msgbox BattleFrontier_OutsideEast_Text_243943, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DAF:: @ 8242DAF - msgbox BattleFrontier_OutsideEast_Text_2439A0, 2 + msgbox BattleFrontier_OutsideEast_Text_2439A0, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DB8:: @ 8242DB8 lock - msgbox BattleFrontier_OutsideEast_Text_243A2B, 4 + msgbox BattleFrontier_OutsideEast_Text_243A2B, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DC3:: @ 8242DC3 lock - msgbox BattleFrontier_OutsideEast_Text_243A53, 4 + msgbox BattleFrontier_OutsideEast_Text_243A53, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DCE:: @ 8242DCE - msgbox BattleFrontier_OutsideEast_Text_242F0D, 3 + msgbox BattleFrontier_OutsideEast_Text_242F0D, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DD7:: @ 8242DD7 - msgbox BattleFrontier_OutsideEast_Text_242F4A, 3 + msgbox BattleFrontier_OutsideEast_Text_242F4A, MSGBOX_SIGN end BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 - msgbox BattleFrontier_OutsideEast_Text_243B68, 2 + msgbox BattleFrontier_OutsideEast_Text_243B68, MSGBOX_NPC end BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 @@ -225,17 +225,17 @@ BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 faceplayer checkflag FLAG_0x1C6 goto_eq BattleFrontier_OutsideEast_EventScript_242DFE - msgbox BattleFrontier_OutsideEast_Text_243C2C, 4 + msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242DFE:: @ 8242DFE - msgbox BattleFrontier_OutsideEast_Text_243CA3, 4 + msgbox BattleFrontier_OutsideEast_Text_243CA3, MSGBOX_DEFAULT release end BattleFrontier_OutsideEast_EventScript_242E08:: @ 8242E08 - msgbox BattleFrontier_OutsideEast_Text_243D0B, 2 + msgbox BattleFrontier_OutsideEast_Text_243D0B, MSGBOX_NPC end BattleFrontier_OutsideEast_Text_242E11: @ 8242E11 @@ -265,22 +265,22 @@ BattleFrontier_OutsideEast_Text_242F4A: @ 8242F4A BattleFrontier_OutsideEast_Text_242F8C: @ 8242F8C .string "Wow!\n" - .string "It’s huge!\p" + .string "It's huge!\p" .string "The BATTLE TOWER feels special.\n" - .string "It’s different from the others.$" + .string "It's different from the others.$" BattleFrontier_OutsideEast_Text_242FDC: @ 8242FDC .string "My grand ambition is to conquer both\n" .string "the BATTLE FRONTIER and the POKéMON\l" .string "LEAGUE.\p" .string "And if my dream comes true…\p" - .string "I… I’m going to ask MIMI next door\n" + .string "I… I'm going to ask MIMI next door\n" .string "if she will be friends with me!$" BattleFrontier_OutsideEast_Text_24308C: @ 824308C - .string "The BATTLE PYRAMID’s too harsh!\n" - .string "I just can’t make it to the top!\p" - .string "Since I’m out of options, maybe I can\n" + .string "The BATTLE PYRAMID's too harsh!\n" + .string "I just can't make it to the top!\p" + .string "Since I'm out of options, maybe I can\n" .string "climb the outside…$" BattleFrontier_OutsideEast_Text_243106: @ 8243106 @@ -291,23 +291,23 @@ BattleFrontier_OutsideEast_Text_243106: @ 8243106 .string "and in utter and total desperation?$" BattleFrontier_OutsideEast_Text_2431A5: @ 82431A5 - .string "I didn’t sleep for a week, but then\n" + .string "I didn't sleep for a week, but then\n" .string "I put together the ultimate team!\p" - .string "I can’t see myself losing, no joke.\n" - .string "We’re storming the BATTLE ARENA!$" + .string "I can't see myself losing, no joke.\n" + .string "We're storming the BATTLE ARENA!$" BattleFrontier_OutsideEast_Text_243230: @ 8243230 .string "Did SCOTT bring you here, too?\n" .string "What is it with that guy?\p" .string "It sounds like he really does know\n" .string "how to spot talented TRAINERS, but…\p" - .string "I’ve never seen him battling in person\n" + .string "I've never seen him battling in person\n" .string "ever.$" BattleFrontier_OutsideEast_Text_2432DD: @ 82432DD .string "ZIGG!\n" .string "I believe in you, little buddy!\p" - .string "I’ll make my little ZIGG any favorite\n" + .string "I'll make my little ZIGG any favorite\n" .string "tasty treats you like if you win!$" BattleFrontier_OutsideEast_Text_24334B: @ 824334B @@ -315,11 +315,11 @@ BattleFrontier_OutsideEast_Text_24334B: @ 824334B BattleFrontier_OutsideEast_Text_243363: @ 8243363 .string "People call me a busybody,\n" - .string "but I can’t help it.\p" - .string "Your hat’s on crooked!\n" + .string "but I can't help it.\p" + .string "Your hat's on crooked!\n" .string "Oh, no, trash on the ground!\l" - .string "Oops, it’s almost dinnertime!\p" - .string "I don’t know if I can stand to just\n" + .string "Oops, it's almost dinnertime!\p" + .string "I don't know if I can stand to just\n" .string "watch at the BATTLE PALACE…$" BattleFrontier_OutsideEast_Text_243425: @ 8243425 @@ -329,24 +329,24 @@ BattleFrontier_OutsideEast_Text_243425: @ 8243425 .string "another shot at glory.$" BattleFrontier_OutsideEast_Text_2434A0: @ 82434A0 - .string "I’m fast on my BIKE, and that goes for\n" + .string "I'm fast on my BIKE, and that goes for\n" .string "the way I battle, too.\p" .string "I win matches in the blink of\n" .string "an eye!$" BattleFrontier_OutsideEast_Text_243504: @ 8243504 - .string "I’m better than my daddy\n" + .string "I'm better than my daddy\n" .string "at POKéMON.$" BattleFrontier_OutsideEast_Text_243529: @ 8243529 .string "Go on, my baby sweetie!\n" .string "Go rack up some wins for Daddy!\p" - .string "You’re just like your mother,\n" - .string "so you’ll be dominating!$" + .string "You're just like your mother,\n" + .string "so you'll be dominating!$" BattleFrontier_OutsideEast_Text_243598: @ 8243598 - .string "It wasn’t easy getting here,\n" - .string "but I’d heard about this knockout\l" + .string "It wasn't easy getting here,\n" + .string "but I'd heard about this knockout\l" .string "pretty girl at the BATTLE ARENA.\p" .string "Instead of her, do you know what\n" .string "I found?\p" @@ -365,18 +365,18 @@ BattleFrontier_OutsideEast_Text_2436F2: @ 82436F2 .string "When there comes a confident TRAINER\n" .string "reaching for the golden pinnacle,\l" .string "there shall appear a man among men.\p" - .string "Don’t know that legend?\n" + .string "Don't know that legend?\n" .string "Well, of course not!\l" .string "I just made it up!\p" - .string "What’s it supposed to mean?\n" - .string "That, my friend, I can’t say!$" + .string "What's it supposed to mean?\n" + .string "That, my friend, I can't say!$" BattleFrontier_OutsideEast_Text_243809: @ 8243809 .string "Man! Oh man!\n" - .string "I’ve never lost once before!\p" + .string "I've never lost once before!\p" .string "But I got wiped out with no saving\n" .string "grace at all!\p" - .string "And then I’m told I don’t have any\n" + .string "And then I'm told I don't have any\n" .string "talent?! Man!$" BattleFrontier_OutsideEast_Text_243895: @ 8243895 @@ -389,14 +389,14 @@ BattleFrontier_OutsideEast_Text_243895: @ 8243895 BattleFrontier_OutsideEast_Text_243943: @ 8243943 .string "Yes!\n" - .string "I’ve finally got enough Battle Points!\p" - .string "I guess I’ll trade for another giant\n" + .string "I've finally got enough Battle Points!\p" + .string "I guess I'll trade for another giant\n" .string "plush DOLL!$" BattleFrontier_OutsideEast_Text_2439A0: @ 82439A0 .string "Oh, yeah, okay!\n" .string "So this is the RANKING HALL!\p" - .string "I’d like to go down in history as\n" + .string "I'd like to go down in history as\n" .string "a super champ and have my name\l" .string "recorded here for posterity.$" @@ -405,8 +405,8 @@ BattleFrontier_OutsideEast_Text_243A2B: @ 8243A2B BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 .string "Ooh, darling, you are so wonderful!\p" - .string "Ooh, I just can’t wait anymore!\p" - .string "Let’s go to a MULTI BATTLE ROOM\n" + .string "Ooh, I just can't wait anymore!\p" + .string "Let's go to a MULTI BATTLE ROOM\n" .string "right this instant!\p" .string "If we get together in the BATTLE SALON,\n" .string "the power of our love will overcome\l" @@ -415,7 +415,7 @@ BattleFrontier_OutsideEast_Text_243A53: @ 8243A53 .string "will topple like dominoes!$" BattleFrontier_OutsideEast_Text_243B68: @ 8243B68 - .string "The BATTLE FRONTIER isn’t exclusively\n" + .string "The BATTLE FRONTIER isn't exclusively\n" .string "for tough TRAINERS.\p" .string "Many people with special abilities\n" .string "have been invited, it seems.\p" diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc index ad58cb70f..b01b0eb2d 100644 --- a/data/maps/BattleFrontier_OutsideWest/scripts.inc +++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7 BattleFrontier_OutsideWest_EventScript_23D3F0:: @ 823D3F0 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23D808, 4 + msgbox BattleFrontier_OutsideWest_Text_23D808, MSGBOX_DEFAULT checkitem ITEM_SS_TICKET, 1 compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D44E @@ -29,15 +29,15 @@ BattleFrontier_OutsideWest_EventScript_23D416:: @ 823D416 end BattleFrontier_OutsideWest_EventScript_23D44E:: @ 823D44E - msgbox BattleFrontier_OutsideWest_Text_23D842, 4 + msgbox BattleFrontier_OutsideWest_Text_23D842, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 - msgbox BattleFrontier_OutsideWest_Text_23D8F2, 5 + msgbox BattleFrontier_OutsideWest_Text_23D8F2, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate @@ -45,10 +45,10 @@ BattleFrontier_OutsideWest_EventScript_23D458:: @ 823D458 end BattleFrontier_OutsideWest_EventScript_23D483:: @ 823D483 - msgbox BattleFrontier_OutsideWest_Text_23D90E, 5 + msgbox BattleFrontier_OutsideWest_Text_23D90E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BattleFrontier_OutsideWest_EventScript_23D4AE - msgbox BattleFrontier_OutsideWest_Text_23D94B, 4 + msgbox BattleFrontier_OutsideWest_Text_23D94B, MSGBOX_DEFAULT call BattleFrontier_OutsideWest_EventScript_23D4BA warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -72,32 +72,32 @@ BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA return BattleFrontier_OutsideWest_EventScript_23D4D8:: @ 823D4D8 - msgbox BattleFrontier_OutsideWest_Text_23D929, 4 + msgbox BattleFrontier_OutsideWest_Text_23D929, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D4E2:: @ 823D4E2 - msgbox BattleFrontier_OutsideWest_Text_23D6F7, 3 + msgbox BattleFrontier_OutsideWest_Text_23D6F7, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4EB:: @ 823D4EB - msgbox BattleFrontier_OutsideWest_Text_23D737, 3 + msgbox BattleFrontier_OutsideWest_Text_23D737, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4F4:: @ 823D4F4 - msgbox BattleFrontier_OutsideWest_Text_23D772, 3 + msgbox BattleFrontier_OutsideWest_Text_23D772, MSGBOX_SIGN end BattleFrontier_OutsideWest_EventScript_23D4FD:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D7A6, 2 + msgbox BattleFrontier_OutsideWest_Text_23D7A6, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D506:: @ 823D4FD - msgbox BattleFrontier_OutsideWest_Text_23D9DD, 2 + msgbox BattleFrontier_OutsideWest_Text_23D9DD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D50F:: @ 823D50F - msgbox BattleFrontier_OutsideWest_Text_23D99C, 2 + msgbox BattleFrontier_OutsideWest_Text_23D99C, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 @@ -112,7 +112,7 @@ BattleFrontier_OutsideWest_EventScript_23D518:: @ 823D518 end BattleFrontier_OutsideWest_EventScript_23D52D:: @ 823D52D - msgbox BattleFrontier_OutsideWest_Text_23DABF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DABF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D536:: @ 823D536 @@ -128,10 +128,10 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A8 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DB7D, 4 + msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT applymovement 10, BattleFrontier_OutsideWest_Movement_2725A4 waitmovement 0 - msgbox BattleFrontier_OutsideWest_Text_23DBCE, 4 + msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT closemessage delay 25 applymovement 9, BattleFrontier_OutsideWest_Movement_2725A6 @@ -152,7 +152,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA compare VAR_FACING, 4 call_if 1, BattleFrontier_OutsideWest_EventScript_23D5BA - msgbox BattleFrontier_OutsideWest_Text_23DC36, 4 + msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23DD3B, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD3B, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 1 goto_eq BattleFrontier_OutsideWest_EventScript_23D653 @@ -232,71 +232,71 @@ BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 end BattleFrontier_OutsideWest_EventScript_23D653:: @ 823D653 - msgbox BattleFrontier_OutsideWest_Text_23DD7A, 4 + msgbox BattleFrontier_OutsideWest_Text_23DD7A, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D65D:: @ 823D65D - msgbox BattleFrontier_OutsideWest_Text_23DDAD, 4 + msgbox BattleFrontier_OutsideWest_Text_23DDAD, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D667:: @ 823D667 - msgbox BattleFrontier_OutsideWest_Text_23DE15, 2 + msgbox BattleFrontier_OutsideWest_Text_23DE15, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D670:: @ 823D670 - msgbox BattleFrontier_OutsideWest_Text_23DF7D, 2 + msgbox BattleFrontier_OutsideWest_Text_23DF7D, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D679:: @ 823D679 - msgbox BattleFrontier_OutsideWest_Text_23DEFD, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEFD, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D682:: @ 823D682 - msgbox BattleFrontier_OutsideWest_Text_23DEB4, 2 + msgbox BattleFrontier_OutsideWest_Text_23DEB4, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D68B:: @ 823D68B - msgbox BattleFrontier_OutsideWest_Text_23DFBF, 2 + msgbox BattleFrontier_OutsideWest_Text_23DFBF, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D694:: @ 823D694 - msgbox BattleFrontier_OutsideWest_Text_23E01E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E01E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D69D:: @ 823D69D - msgbox BattleFrontier_OutsideWest_Text_23E09F, 2 + msgbox BattleFrontier_OutsideWest_Text_23E09F, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6A6:: @ 823D6A6 - msgbox BattleFrontier_OutsideWest_Text_23E102, 2 + msgbox BattleFrontier_OutsideWest_Text_23E102, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6AF:: @ 823D6AF - msgbox BattleFrontier_OutsideWest_Text_23E154, 2 + msgbox BattleFrontier_OutsideWest_Text_23E154, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6B8:: @ 823D6B8 lock - msgbox BattleFrontier_OutsideWest_Text_23E273, 4 + msgbox BattleFrontier_OutsideWest_Text_23E273, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6C3:: @ 823D6C3 lock - msgbox BattleFrontier_OutsideWest_Text_23E2E9, 4 + msgbox BattleFrontier_OutsideWest_Text_23E2E9, MSGBOX_DEFAULT release end BattleFrontier_OutsideWest_EventScript_23D6CE:: @ 823D6CE - msgbox BattleFrontier_OutsideWest_Text_23E37E, 2 + msgbox BattleFrontier_OutsideWest_Text_23E37E, MSGBOX_NPC end BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 lock faceplayer - msgbox BattleFrontier_OutsideWest_Text_23E410, 4 + msgbox BattleFrontier_OutsideWest_Text_23E410, MSGBOX_DEFAULT closemessage applymovement 23, BattleFrontier_OutsideWest_Movement_2725A2 waitmovement 0 @@ -304,7 +304,7 @@ BattleFrontier_OutsideWest_EventScript_23D6D7:: @ 823D6D7 end BattleFrontier_OutsideWest_EventScript_23D6EE:: @ 823D6EE - msgbox BattleFrontier_OutsideWest_Text_23E5A5, 2 + msgbox BattleFrontier_OutsideWest_Text_23E5A5, MSGBOX_NPC end BattleFrontier_OutsideWest_Text_23D6F7: @ 823D6F7 @@ -329,14 +329,14 @@ BattleFrontier_OutsideWest_Text_23D808: @ 823D808 .string "May I see your TICKET?$" BattleFrontier_OutsideWest_Text_23D842: @ 823D842 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" BattleFrontier_OutsideWest_Text_23D89D: @ 823D89D .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" BattleFrontier_OutsideWest_Text_23D8F2: @ 823D8F2 @@ -356,13 +356,13 @@ BattleFrontier_OutsideWest_Text_23D97A: @ 823D97A .string "Then, where would you like to go?$" BattleFrontier_OutsideWest_Text_23D99C: @ 823D99C - .string "I’m the best out of all my friends.\n" + .string "I'm the best out of all my friends.\n" .string "But here…\l" - .string "I’ve been useless!$" + .string "I've been useless!$" BattleFrontier_OutsideWest_Text_23D9DD: @ 823D9DD .string "I want to go to the BATTLE TOWER,\n" - .string "but I can’t find it even though I have\l" + .string "but I can't find it even though I have\l" .string "a map of the BATTLE FRONTIER.\p" .string "This place is just too big!$" @@ -373,40 +373,40 @@ BattleFrontier_OutsideWest_Text_23DA60: @ 823DA60 .string "Urrrrp…$" BattleFrontier_OutsideWest_Text_23DABF: @ 823DABF - .string "It’s not as if just anyone can come\n" + .string "It's not as if just anyone can come\n" .string "here, you know?\p" - .string "Only those TRAINERS who’ve been\n" + .string "Only those TRAINERS who've been\n" .string "recognized as tough are brought here.\p" - .string "That’s why many TRAINERS don’t even\n" + .string "That's why many TRAINERS don't even\n" .string "know about the BATTLE FRONTIER.$" BattleFrontier_OutsideWest_Text_23DB7D: @ 823DB7D .string "Hey, bro…\p" .string "Are you sure we can make challenges\n" - .string "even if we don’t have any POKéMON?$" + .string "even if we don't have any POKéMON?$" BattleFrontier_OutsideWest_Text_23DBCE: @ 823DBCE .string "Uh…\n" - .string "I’m sure it’ll be okay.\p" + .string "I'm sure it'll be okay.\p" .string "I think…\p" .string "But remember that big scary guy?\n" - .string "He said, “I’ll lend you POKéMON!”$" + .string "He said, “I'll lend you POKéMON!”$" BattleFrontier_OutsideWest_Text_23DC36: @ 823DC36 - .string "That’s the BATTLE FACTORY.\n" + .string "That's the BATTLE FACTORY.\n" .string "You can rent strong POKéMON there.\p" .string "But it makes me wonder.\n" - .string "Who’s raising those rental POKéMON?$" + .string "Who's raising those rental POKéMON?$" BattleFrontier_OutsideWest_Text_23DCB0: @ 823DCB0 - .string "I’m scared of going into the BATTLE\n" + .string "I'm scared of going into the BATTLE\n" .string "PIKE because of SEVIPER…\p" .string "B-but I came all the way here, so I will\n" .string "try to conquer everything!\l" .string "…Shudder…$" BattleFrontier_OutsideWest_Text_23DD3B: @ 823DD3B - .string "Let’s play rock, paper, scissors!\n" + .string "Let's play rock, paper, scissors!\n" .string "One, two, three!\p" .string "… … … … … …$" @@ -417,53 +417,53 @@ BattleFrontier_OutsideWest_Text_23DD7A: @ 823DD7A BattleFrontier_OutsideWest_Text_23DDAD: @ 823DDAD .string "Oh, no…\n" .string "I lost.\p" - .string "I guess I’m not very lucky today.\n" - .string "I’ll put off my BATTLE PIKE challenge\l" + .string "I guess I'm not very lucky today.\n" + .string "I'll put off my BATTLE PIKE challenge\l" .string "until tomorrow.$" BattleFrontier_OutsideWest_Text_23DE15: @ 823DE15 - .string "I believe I’m the only person here who,\n" + .string "I believe I'm the only person here who,\n" .string "for some unknown reason, would choose\l" .string "fishing over battling.\p" - .string "Huh? You can’t catch anything here?\n" - .string "That’s disappointing…$" + .string "Huh? You can't catch anything here?\n" + .string "That's disappointing…$" BattleFrontier_OutsideWest_Text_23DEB4: @ 823DEB4 - .string "Today, I’m going to keep battling, no\n" + .string "Today, I'm going to keep battling, no\n" .string "matter what, until I get a Symbol.$" BattleFrontier_OutsideWest_Text_23DEFD: @ 823DEFD - .string "Oh? You’re off to challenge\n" + .string "Oh? You're off to challenge\n" .string "the BATTLE DOME?\p" - .string "I’ll wish you the best of luck.\n" + .string "I'll wish you the best of luck.\n" .string "Let us both win our way up and meet\l" .string "in challenges.$" BattleFrontier_OutsideWest_Text_23DF7D: @ 823DF7D .string "Grandpa, over here!\n" .string "The BATTLE DOME is here!\l" - .string "Go get ’em, Grandpa!$" + .string "Go get 'em, Grandpa!$" BattleFrontier_OutsideWest_Text_23DFBF: @ 823DFBF .string "Ah, so this here is the BATTLE DOME?\n" - .string "I won’t let GENTLEMEN beat me!\p" + .string "I won't let GENTLEMEN beat me!\p" .string "But where is the entrance?$" BattleFrontier_OutsideWest_Text_23E01E: @ 823E01E .string "There used to be nothing here not all\n" .string "that long ago.\p" .string "But, now look at this place! Amazing!\n" - .string "I’ll bring my mother out to see this.$" + .string "I'll bring my mother out to see this.$" BattleFrontier_OutsideWest_Text_23E09F: @ 823E09F - .string "I’ve finally arrived at the BATTLE\n" + .string "I've finally arrived at the BATTLE\n" .string "FRONTIER!\p" - .string "I’m sure to grab attention with\n" + .string "I'm sure to grab attention with\n" .string "my looks and ability!$" BattleFrontier_OutsideWest_Text_23E102: @ 823E102 .string "Munch, munch…\p" - .string "It looks like this square’s filled with\n" + .string "It looks like this square's filled with\n" .string "tough people.\p" .string "Munch, munch…$" @@ -482,7 +482,7 @@ BattleFrontier_OutsideWest_Text_23E154: @ 823E154 BattleFrontier_OutsideWest_Text_23E273: @ 823E273 .string "Huh? Will you listen to yourself?\n" - .string "That’s nothing!\p" + .string "That's nothing!\p" .string "Why, the last time I cheered for him,\n" .string "our eyes met and sparks flew!$" @@ -504,7 +504,7 @@ BattleFrontier_OutsideWest_Text_23E37E: @ 823E37E BattleFrontier_OutsideWest_Text_23E410: @ 823E410 .string "Those people squabbling over there…\p" - .string "It’s hard to believe, but they once\n" + .string "It's hard to believe, but they once\n" .string "were TRAINERS, and good ones, too.\p" .string "They used to be incredibly tough,\n" .string "and they were famous, too.\p" @@ -512,7 +512,7 @@ BattleFrontier_OutsideWest_Text_23E410: @ 823E410 .string "certain TRAINER at a tournament.\p" .string "They were so thoroughly whipped,\n" .string "they became smitten by the TRAINER.\p" - .string "Now they’re just fans of the TRAINER.\n" + .string "Now they're just fans of the TRAINER.\n" .string "They go cheer for their idol at the\l" .string "BATTLE DOME every day now.$" @@ -520,7 +520,7 @@ BattleFrontier_OutsideWest_Text_23E5A5: @ 823E5A5 .string "I heard a rumor that someone saw\n" .string "a POKéMON with an unusually long tail\l" .string "somewhere in the BATTLE FRONTIER.\p" - .string "It must be adorable. I’m sure of it…\p" + .string "It must be adorable. I'm sure of it…\p" .string "Oh, challenges can wait. I feel driven\n" .string "to find the delightful creature!$" diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 3dff67a93..42c6db053 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,26 +32,26 @@ 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 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 diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc index 9015694eb..f6a7715d1 100644 --- a/data/maps/BattleFrontier_RankingHall/scripts.inc +++ b/data/maps/BattleFrontier_RankingHall/scripts.inc @@ -71,34 +71,34 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522 end BattleFrontier_RankingHall_EventScript_25E52F:: @ 825E52F - msgbox BattleFrontier_RankingHall_Text_25E57C, 2 + msgbox BattleFrontier_RankingHall_Text_25E57C, MSGBOX_NPC end BattleFrontier_RankingHall_EventScript_25E538:: @ 825E538 - msgbox BattleFrontier_RankingHall_Text_25E5F9, 3 + msgbox BattleFrontier_RankingHall_Text_25E5F9, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E541:: @ 825E541 - msgbox BattleFrontier_RankingHall_Text_25E62E, 3 + msgbox BattleFrontier_RankingHall_Text_25E62E, MSGBOX_SIGN end BattleFrontier_RankingHall_EventScript_25E54A:: @ 825E54A lock faceplayer - msgbox BattleFrontier_RankingHall_Text_25E666, 5 + msgbox BattleFrontier_RankingHall_Text_25E666, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq BattleFrontier_RankingHall_EventScript_25E569 - msgbox BattleFrontier_RankingHall_Text_25E6B6, 4 + msgbox BattleFrontier_RankingHall_Text_25E6B6, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E569:: @ 825E569 - msgbox BattleFrontier_RankingHall_Text_25E685, 4 + msgbox BattleFrontier_RankingHall_Text_25E685, MSGBOX_DEFAULT release end BattleFrontier_RankingHall_EventScript_25E573:: @ 825E573 - msgbox BattleFrontier_RankingHall_Text_25E715, 2 + msgbox BattleFrontier_RankingHall_Text_25E715, MSGBOX_NPC end BattleFrontier_RankingHall_Text_25E57C: @ 825E57C @@ -119,17 +119,17 @@ BattleFrontier_RankingHall_Text_25E666: @ 825E666 .string "Hi, is your name on this list?$" BattleFrontier_RankingHall_Text_25E685: @ 825E685 - .string "Wow, that’s super!\n" - .string "I’ll have to try harder, too!$" + .string "Wow, that's super!\n" + .string "I'll have to try harder, too!$" BattleFrontier_RankingHall_Text_25E6B6: @ 825E6B6 .string "Oh, is that right?\p" - .string "If you saw your friend’s name up here,\n" + .string "If you saw your friend's name up here,\n" .string "I bet it would make you work harder!$" BattleFrontier_RankingHall_Text_25E715: @ 825E715 .string "Hmm…\n" - .string "My name’s not up there…\p" - .string "Well, it’s only natural since I haven’t\n" + .string "My name's not up there…\p" + .string "Well, it's only natural since I haven't\n" .string "taken any challenges yet.$" diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc index ec38c3e9d..30f3a10d5 100644 --- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc +++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 waitmovement 0 applymovement 1, BattleFrontier_ReceptionGate_Movement_27259A waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266580, 4 + msgbox BattleFrontier_ReceptionGate_Text_266580, MSGBOX_DEFAULT closemessage applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D2 waitmovement 0 @@ -27,16 +27,16 @@ BattleFrontier_ReceptionGate_EventScript_2661F3:: @ 82661F3 end BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2665F7, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2665F7, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message BattleFrontier_ReceptionGate_Text_266676 waitfanfare waitmessage - msgbox BattleFrontier_ReceptionGate_Text_266695, 4 + msgbox BattleFrontier_ReceptionGate_Text_266695, MSGBOX_DEFAULT setflag FLAG_SYS_FRONTIER_PASS - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 - msgbox BattleFrontier_ReceptionGate_Text_266703, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2725A6 applymovement 2, BattleFrontier_ReceptionGate_Movement_2725A6 @@ -47,14 +47,14 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 applymovement 2, BattleFrontier_ReceptionGate_Movement_272598 applymovement 255, BattleFrontier_ReceptionGate_Movement_272598 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266733, 4 + msgbox BattleFrontier_ReceptionGate_Text_266733, MSGBOX_DEFAULT closemessage applymovement 1, BattleFrontier_ReceptionGate_Movement_2662F0 applymovement 2, BattleFrontier_ReceptionGate_Movement_2662F6 applymovement 255, BattleFrontier_ReceptionGate_Movement_2662D7 applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E0 waitmovement 0 - msgbox BattleFrontier_ReceptionGate_Text_266764, 4 + msgbox BattleFrontier_ReceptionGate_Text_266764, MSGBOX_DEFAULT closemessage applymovement 4, BattleFrontier_ReceptionGate_Movement_2662E8 waitmovement 0 @@ -121,15 +121,15 @@ BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_2665B2, 4 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2665B2, MSGBOX_DEFAULT + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266310:: @ 8266310 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266857, 4 + msgbox BattleFrontier_ReceptionGate_Text_266857, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end @@ -154,59 +154,59 @@ BattleFrontier_ReceptionGate_EventScript_266320:: @ 8266320 end BattleFrontier_ReceptionGate_EventScript_2663AE:: @ 82663AE - msgbox BattleFrontier_ReceptionGate_Text_2668C2, 4 + msgbox BattleFrontier_ReceptionGate_Text_2668C2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663BC:: @ 82663BC - msgbox BattleFrontier_ReceptionGate_Text_26696F, 4 + msgbox BattleFrontier_ReceptionGate_Text_26696F, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663CA:: @ 82663CA - msgbox BattleFrontier_ReceptionGate_Text_266A34, 4 + msgbox BattleFrontier_ReceptionGate_Text_266A34, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663D8:: @ 82663D8 - msgbox BattleFrontier_ReceptionGate_Text_266AC2, 4 + msgbox BattleFrontier_ReceptionGate_Text_266AC2, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663E6:: @ 82663E6 - msgbox BattleFrontier_ReceptionGate_Text_266B5D, 4 + msgbox BattleFrontier_ReceptionGate_Text_266B5D, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_2663F4:: @ 82663F4 - msgbox BattleFrontier_ReceptionGate_Text_266C24, 4 + msgbox BattleFrontier_ReceptionGate_Text_266C24, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266402:: @ 8266402 - msgbox BattleFrontier_ReceptionGate_Text_266CBB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266CBB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_266410:: @ 8266410 - msgbox BattleFrontier_ReceptionGate_Text_266D1C, 4 + msgbox BattleFrontier_ReceptionGate_Text_266D1C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26641E:: @ 826641E - msgbox BattleFrontier_ReceptionGate_Text_266DCB, 4 + msgbox BattleFrontier_ReceptionGate_Text_266DCB, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266320 end BattleFrontier_ReceptionGate_EventScript_26642C:: @ 826642C - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_266436:: @ 8266436 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_266E66, 4 + msgbox BattleFrontier_ReceptionGate_Text_266E66, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end @@ -225,39 +225,39 @@ BattleFrontier_ReceptionGate_EventScript_266446:: @ 8266446 end BattleFrontier_ReceptionGate_EventScript_2664A4:: @ 82664A4 - msgbox BattleFrontier_ReceptionGate_Text_266F04, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F04, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664B2:: @ 82664B2 - msgbox BattleFrontier_ReceptionGate_Text_266F69, 4 + msgbox BattleFrontier_ReceptionGate_Text_266F69, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664C0:: @ 82664C0 - msgbox BattleFrontier_ReceptionGate_Text_267080, 4 + msgbox BattleFrontier_ReceptionGate_Text_267080, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664CE:: @ 82664CE - msgbox BattleFrontier_ReceptionGate_Text_26716A, 4 + msgbox BattleFrontier_ReceptionGate_Text_26716A, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664DC:: @ 82664DC - msgbox BattleFrontier_ReceptionGate_Text_267298, 4 + msgbox BattleFrontier_ReceptionGate_Text_267298, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266446 end BattleFrontier_ReceptionGate_EventScript_2664EA:: @ 82664EA - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end BattleFrontier_ReceptionGate_EventScript_2664F4:: @ 82664F4 lock faceplayer - msgbox BattleFrontier_ReceptionGate_Text_267357, 4 + msgbox BattleFrontier_ReceptionGate_Text_267357, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end @@ -274,22 +274,22 @@ BattleFrontier_ReceptionGate_EventScript_266504:: @ 8266504 end BattleFrontier_ReceptionGate_EventScript_26654C:: @ 826654C - msgbox BattleFrontier_ReceptionGate_Text_2673A1, 4 + msgbox BattleFrontier_ReceptionGate_Text_2673A1, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_26655A:: @ 826655A - msgbox BattleFrontier_ReceptionGate_Text_2674F3, 4 + msgbox BattleFrontier_ReceptionGate_Text_2674F3, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266568:: @ 8266568 - msgbox BattleFrontier_ReceptionGate_Text_26761C, 4 + msgbox BattleFrontier_ReceptionGate_Text_26761C, MSGBOX_DEFAULT goto BattleFrontier_ReceptionGate_EventScript_266504 end BattleFrontier_ReceptionGate_EventScript_266576:: @ 8266576 - msgbox BattleFrontier_ReceptionGate_Text_2666C6, 4 + msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT release end @@ -304,7 +304,7 @@ BattleFrontier_ReceptionGate_Text_2665B2: @ 82665B2 BattleFrontier_ReceptionGate_Text_2665F7: @ 82665F7 .string "For a first-time visitor, we issue\n" .string "the FRONTIER PASS.\p" - .string "It’s for use at all the facilities\n" + .string "It's for use at all the facilities\n" .string "in the BATTLE FRONTIER.\p" .string "Here you are!$" @@ -321,7 +321,7 @@ BattleFrontier_ReceptionGate_Text_2666C6: @ 82666C6 .string "FRONTIER has to offer!$" BattleFrontier_ReceptionGate_Text_266703: @ 8266703 - .string "???: Well, if it isn’t {PLAYER}{KUN}!\n" + .string "???: Well, if it isn't {PLAYER}{KUN}!\n" .string "You came out here!$" BattleFrontier_ReceptionGate_Text_266733: @ 8266733 @@ -329,17 +329,17 @@ BattleFrontier_ReceptionGate_Text_266733: @ 8266733 .string "Good day to you, sir!$" BattleFrontier_ReceptionGate_Text_266764: @ 8266764 - .string "SCOTT: It’s great to see you here,\n" + .string "SCOTT: It's great to see you here,\n" .string "it really is!\p" - .string "I hope you’ll take your time and\n" + .string "I hope you'll take your time and\n" .string "explore everywhere.\p" - .string "Naturally, I hope you’ll also experience\n" + .string "Naturally, I hope you'll also experience\n" .string "the pure essence of battling.\p" .string "I also have my quarters here, so feel\n" .string "free to visit if you have time.$" BattleFrontier_ReceptionGate_Text_266857: @ 8266857 - .string "I’m your guide to the various facilities\n" + .string "I'm your guide to the various facilities\n" .string "here in the BATTLE FRONTIER.$" BattleFrontier_ReceptionGate_Text_26689D: @ 826689D @@ -347,7 +347,7 @@ BattleFrontier_ReceptionGate_Text_26689D: @ 826689D BattleFrontier_ReceptionGate_Text_2668C2: @ 82668C2 .string "It is the gigantic tower considered\n" - .string "to be the BATTLE FRONTIER’s symbol.\p" + .string "to be the BATTLE FRONTIER's symbol.\p" .string "There are four kinds of BATTLE ROOMS\n" .string "in the tower for SINGLE, DOUBLE, MULTI,\l" .string "and LINK MULTI BATTLES.$" @@ -412,7 +412,7 @@ BattleFrontier_ReceptionGate_Text_266DCB: @ 8266DCB .string "for fabulous prizes there.$" BattleFrontier_ReceptionGate_Text_266E66: @ 8266E66 - .string "I’m your guide to the basic rules that\n" + .string "I'm your guide to the basic rules that\n" .string "are common to all the challenges\l" .string "offered by the facilities in the BATTLE\l" .string "FRONTIER.$" @@ -422,7 +422,7 @@ BattleFrontier_ReceptionGate_Text_266EE0: @ 8266EE0 BattleFrontier_ReceptionGate_Text_266F04: @ 8266F04 .string "All the challenges at the BATTLE\n" - .string "FRONTIER’s facilities come in\l" + .string "FRONTIER's facilities come in\l" .string "two courses--Level 50 and Open Level.$" BattleFrontier_ReceptionGate_Text_266F69: @ 8266F69 @@ -466,7 +466,7 @@ BattleFrontier_ReceptionGate_Text_267298: @ 8267298 .string "different items.$" BattleFrontier_ReceptionGate_Text_267357: @ 8267357 - .string "I’m your guide to the FRONTIER PASS.$" + .string "I'm your guide to the FRONTIER PASS.$" BattleFrontier_ReceptionGate_Text_26737C: @ 826737C .string "Which would you like to learn about?$" @@ -480,7 +480,7 @@ BattleFrontier_ReceptionGate_Text_2673A1: @ 82673A1 .string "To earn a symbol, TRAINERS may need\n" .string "to defeat other TRAINERS in a row,\l" .string "and may need to win events repeatedly.\p" - .string "It’s certainly not easy to win symbols.\n" + .string "It's certainly not easy to win symbols.\n" .string "I wish you the best of luck!$" BattleFrontier_ReceptionGate_Text_2674F3: @ 82674F3 diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index ac7c5eb7a..6824df384 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -46,7 +46,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_SILVER goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_2640BC, 4 + msgbox BattleFrontier_ScottsHouse_Text_2640BC, MSGBOX_DEFAULT giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 @@ -70,7 +70,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC checkflag FLAG_SYS_PYRAMID_GOLD goto_if 0, BattleFrontier_ScottsHouse_EventScript_2636EC - msgbox BattleFrontier_ScottsHouse_Text_264216, 4 + msgbox BattleFrontier_ScottsHouse_Text_264216, MSGBOX_DEFAULT giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2637D0 @@ -80,12 +80,12 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A end BattleFrontier_ScottsHouse_EventScript_2637D0:: @ 82637D0 - msgbox BattleFrontier_ScottsHouse_Text_2643EB, 4 + msgbox BattleFrontier_ScottsHouse_Text_2643EB, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2637DA:: @ 82637DA - msgbox BattleFrontier_ScottsHouse_Text_264373, 4 + msgbox BattleFrontier_ScottsHouse_Text_264373, MSGBOX_DEFAULT release end @@ -95,17 +95,17 @@ BattleFrontier_ScottsHouse_EventScript_2637E4:: @ 82637E4 goto_eq BattleFrontier_ScottsHouse_EventScript_263807 compare VAR_RESULT, 2 goto_eq BattleFrontier_ScottsHouse_EventScript_263811 - msgbox BattleFrontier_ScottsHouse_Text_263DDD, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DDD, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263807:: @ 8263807 - msgbox BattleFrontier_ScottsHouse_Text_263F12, 4 + msgbox BattleFrontier_ScottsHouse_Text_263F12, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263811:: @ 8263811 - msgbox BattleFrontier_ScottsHouse_Text_263FFE, 4 + msgbox BattleFrontier_ScottsHouse_Text_263FFE, MSGBOX_DEFAULT release end @@ -133,7 +133,7 @@ BattleFrontier_ScottsHouse_EventScript_26381B:: @ 826381B end BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A - msgbox BattleFrontier_ScottsHouse_Text_264412, 4 + msgbox BattleFrontier_ScottsHouse_Text_264412, MSGBOX_DEFAULT givedecoration_std 42 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 @@ -143,12 +143,12 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A end BattleFrontier_ScottsHouse_EventScript_2638A0:: @ 82638A0 - msgbox BattleFrontier_ScottsHouse_Text_264583, 4 + msgbox BattleFrontier_ScottsHouse_Text_264583, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_2638AA:: @ 82638AA - msgbox BattleFrontier_ScottsHouse_Text_264546, 4 + msgbox BattleFrontier_ScottsHouse_Text_264546, MSGBOX_DEFAULT release end @@ -176,7 +176,7 @@ BattleFrontier_ScottsHouse_EventScript_2638B4:: @ 82638B4 end BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 - msgbox BattleFrontier_ScottsHouse_Text_26449F, 4 + msgbox BattleFrontier_ScottsHouse_Text_26449F, MSGBOX_DEFAULT givedecoration_std 43 compare VAR_RESULT, 0 goto_eq BattleFrontier_ScottsHouse_EventScript_2638A0 @@ -186,12 +186,12 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 end BattleFrontier_ScottsHouse_EventScript_263939:: @ 8263939 - msgbox BattleFrontier_ScottsHouse_Text_263DB8, 4 + msgbox BattleFrontier_ScottsHouse_Text_263DB8, MSGBOX_DEFAULT release end BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 - msgbox BattleFrontier_ScottsHouse_Text_263A3F, 4 + msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT closemessage delay 30 compare VAR_FACING, 2 @@ -202,10 +202,10 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A29 compare VAR_FACING, 3 call_if 1, BattleFrontier_ScottsHouse_EventScript_263A34 - msgbox BattleFrontier_ScottsHouse_Text_263B29, 4 + msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT applymovement 1, BattleFrontier_ScottsHouse_Movement_27259E waitmovement 0 - msgbox BattleFrontier_ScottsHouse_Text_263BD4, 4 + msgbox BattleFrontier_ScottsHouse_Text_263BD4, MSGBOX_DEFAULT compare VAR_0x40D1, 13 goto_eq BattleFrontier_ScottsHouse_EventScript_2639BC compare VAR_0x40D1, 9 @@ -242,7 +242,7 @@ BattleFrontier_ScottsHouse_EventScript_2639E9:: @ 82639E9 BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 special sub_813A9D0 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 - msgbox BattleFrontier_ScottsHouse_Text_263CD0, 4 + msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT setflag FLAG_0x1D1 setflag FLAG_TEMP_2 release @@ -274,7 +274,7 @@ BattleFrontier_ScottsHouse_Text_263A3F: @ 8263A3F .string "Anyway, {PLAYER}{KUN}, let me formally\n" .string "welcome you to the BATTLE FRONTIER.\p" .string "This is my dream come true.\n" - .string "It took me years and years, but I’ve\l" + .string "It took me years and years, but I've\l" .string "finally given shape to my dream.$" BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 @@ -286,10 +286,10 @@ BattleFrontier_ScottsHouse_Text_263B29: @ 8263B29 .string "or time it took to make this real.$" BattleFrontier_ScottsHouse_Text_263BD4: @ 8263BD4 - .string "But that’s all in the past.\n" + .string "But that's all in the past.\n" .string "No point dwelling on that!\p" .string "All I want for you is to enjoy battling\n" - .string "to your heart’s content here.\p" + .string "to your heart's content here.\p" .string "{PLAYER}{KUN}, I want you to have this\n" .string "as a memento for all the time our\l" .string "paths crossed on our journeys.$" @@ -308,17 +308,17 @@ BattleFrontier_ScottsHouse_Text_263CD0: @ 8263CD0 .string "see fit, like trading them for items.$" BattleFrontier_ScottsHouse_Text_263DB8: @ 8263DB8 - .string "I’m expecting great things from you!$" + .string "I'm expecting great things from you!$" BattleFrontier_ScottsHouse_Text_263DDD: @ 8263DDD .string "SCOTT: Every TRAINER is an individual.\n" .string "They all lead lives of their own.\p" - .string "But when they’re in a battle,\n" - .string "it doesn’t matter who they are.\p" - .string "They’re all the same!\p" + .string "But when they're in a battle,\n" + .string "it doesn't matter who they are.\p" + .string "They're all the same!\p" .string "I love the purity of battle,\n" .string "where everyone is equal.\p" - .string "That’s why I go everywhere seeking\n" + .string "That's why I go everywhere seeking\n" .string "TRAINERS who are serious about\l" .string "battling, and invite them here.$" @@ -329,11 +329,11 @@ BattleFrontier_ScottsHouse_Text_263F12: @ 8263F12 .string "symbols from them?\p" .string "I handpicked the FRONTIER BRAINS\n" .string "as the toughest TRAINERS anywhere.\p" - .string "But I’m sure that seeing how tough\n" + .string "But I'm sure that seeing how tough\n" .string "you are will startle even them!$" BattleFrontier_ScottsHouse_Text_263FFE: @ 8263FFE - .string "SCOTT: You don’t just train for battle,\n" + .string "SCOTT: You don't just train for battle,\n" .string "right?\p" .string "I think I remember you working on\n" .string "a POKéDEX as well.\p" @@ -348,34 +348,34 @@ BattleFrontier_ScottsHouse_Text_2640BC: @ 82640BC .string "…Wait a second…\n" .string "Oh!\p" .string "Your FRONTIER PASS!\n" - .string "You’ve collected the full set\l" + .string "You've collected the full set\l" .string "of silver symbols!\p" - .string "That’s more than impressive!\n" + .string "That's more than impressive!\n" .string "You are tough, just as I suspected!\p" - .string "Normally, I wouldn’t do something\n" + .string "Normally, I wouldn't do something\n" .string "like this, but this is a special time!\p" .string "I want you to have this.\n" - .string "I’m sure you can put it to proper use.$" + .string "I'm sure you can put it to proper use.$" BattleFrontier_ScottsHouse_Text_264216: @ 8264216 - .string "SCOTT: I hope you’re enjoying\n" + .string "SCOTT: I hope you're enjoying\n" .string "everything in the BATTLE FRONTIER.\p" .string "…Wait a second…\n" .string "Oh, my disbelieving eyes!\p" .string "Your FRONTIER PASS!\n" - .string "You’ve gathered up the full set\l" + .string "You've gathered up the full set\l" .string "of gold symbols!\p" - .string "That’s more than stupendous!\n" - .string "You’re incredible, just as I suspected!\p" + .string "That's more than stupendous!\n" + .string "You're incredible, just as I suspected!\p" .string "… … … … … …\p" - .string "{PLAYER}, you’ve got to accept this!\p" + .string "{PLAYER}, you've got to accept this!\p" .string "I think you will be able to\n" .string "appreciate the value of my gift!$" BattleFrontier_ScottsHouse_Text_264373: @ 8264373 .string "I must say I have the gift of knowing\n" .string "a good TRAINER when I see one.\p" - .string "I’m so glad I had the foresight to\n" + .string "I'm so glad I had the foresight to\n" .string "bring you here!$" BattleFrontier_ScottsHouse_Text_2643EB: @ 82643EB @@ -386,18 +386,18 @@ BattleFrontier_ScottsHouse_Text_264412: @ 8264412 .string "SCOTT: Oh, I heard about you!\n" .string "How you ruled the BATTLE TOWER!\l" .string "You beat over 50 TRAINERS in a row?\p" - .string "That’s fantastic!\n" + .string "That's fantastic!\n" .string "I want you to have this!$" BattleFrontier_ScottsHouse_Text_26449F: @ 826449F .string "SCOTT: Oh, my! I heard about you!\n" .string "How you overwhelmed the BATTLE TOWER!\l" .string "You beat over 100 TRAINERS in a row?\p" - .string "That’s ridiculously spectacular!\n" - .string "You’ve got to have this!$" + .string "That's ridiculously spectacular!\n" + .string "You've got to have this!$" BattleFrontier_ScottsHouse_Text_264546: @ 8264546 - .string "I’ll be expecting to hear even greater\n" + .string "I'll be expecting to hear even greater\n" .string "things about you now!$" BattleFrontier_ScottsHouse_Text_264583: @ 8264583 diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index fe939172d..dc3407e33 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -4,10 +4,10 @@ BirthIsland_Harbor_MapScripts:: @ 826805C BirthIsland_Harbor_EventScript_26805D:: @ 826805D lock faceplayer - msgbox BirthIsland_Harbor_Text_2C6B90, 5 + msgbox BirthIsland_Harbor_Text_2C6B90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq BirthIsland_Harbor_EventScript_2680A2 - msgbox BirthIsland_Harbor_Text_2A6A5D, 4 + msgbox BirthIsland_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, BirthIsland_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D end BirthIsland_Harbor_EventScript_2680A2:: @ 82680A2 - msgbox BirthIsland_Harbor_Text_2A6A82, 4 + msgbox BirthIsland_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 198fffa2b..cf7582e0d 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B1F_MapScripts:: @ 82357A8 CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9 lock faceplayer - msgbox CaveOfOrigin_B1F_Text_23586E, 4 + msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT closemessage applymovement 1, CaveOfOrigin_B1F_Movement_2725A6 waitmovement 0 @@ -47,7 +47,7 @@ CaveOfOrigin_B1F_EventScript_235842:: @ 8235842 goto CaveOfOrigin_B1F_EventScript_2357F0 CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D - msgbox CaveOfOrigin_B1F_Text_235CEE, 4 + msgbox CaveOfOrigin_B1F_Text_235CEE, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenspeed 1, 4 @@ -61,27 +61,27 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D CaveOfOrigin_B1F_Text_23586E: @ 823586E .string "Ah, so you are {PLAYER}{KUN}?\n" - .string "I’ve heard tales of your exploits.\p" + .string "I've heard tales of your exploits.\p" .string "My name is WALLACE.\p" .string "I was once the GYM LEADER of\n" .string "SOOTOPOLIS, but something came up.\p" - .string "So now, I’ve entrusted my mentor JUAN\n" - .string "with the GYM’s operation.\p" + .string "So now, I've entrusted my mentor JUAN\n" + .string "with the GYM's operation.\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "GROUDON and KYOGRE, the two POKéMON\n" .string "wreaking havoc here, are considered\l" .string "to be super-ancient POKéMON.\p" - .string "But there aren’t just two super-\n" + .string "But there aren't just two super-\n" .string "ancient POKéMON.\p" .string "There is one more somewhere.\p" .string "Somewhere, there is a super-\n" .string "ancient POKéMON named RAYQUAZA.\p" - .string "It’s said that it was RAYQUAZA that\n" + .string "It's said that it was RAYQUAZA that\n" .string "becalmed the two combatants in\l" .string "the distant past.\p" .string "But even I have no clue as to\n" - .string "RAYQUAZA’s whereabouts…$" + .string "RAYQUAZA's whereabouts…$" CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE .string "WALLACE: {PLAYER}{KUN}, do you perhaps\n" @@ -90,7 +90,7 @@ CaveOfOrigin_B1F_Text_235ACE: @ 8235ACE CaveOfOrigin_B1F_Text_235B23: @ 8235B23 .string "WALLACE: The CAVE OF ORIGIN?\p" - .string "But that’s right here!\n" + .string "But that's right here!\n" .string "I need you to do better than that!\p" .string "Please, I need you to think about\n" .string "where RAYQUAZA might be right now.$" @@ -105,14 +105,14 @@ CaveOfOrigin_B1F_Text_235BBF: @ 8235BBF .string "more carefully for me?$" CaveOfOrigin_B1F_Text_235C99: @ 8235C99 - .string "WALLACE: Huh? You don’t remember?\n" - .string "Hmm… That’s a problem…\p" - .string "Can’t you remember somehow?$" + .string "WALLACE: Huh? You don't remember?\n" + .string "Hmm… That's a problem…\p" + .string "Can't you remember somehow?$" CaveOfOrigin_B1F_Text_235CEE: @ 8235CEE .string "WALLACE: The SKY PILLAR?\p" - .string "That’s it!\n" + .string "That's it!\n" .string "It must be the SKY PILLAR!\p" - .string "{PLAYER}{KUN}, there’s not a moment to lose!\n" - .string "We’ll head to the SKY PILLAR right away!$" + .string "{PLAYER}{KUN}, there's not a moment to lose!\n" + .string "We'll head to the SKY PILLAR right away!$" diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 9d085e45a..760336d91 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -51,7 +51,7 @@ DesertRuins_EventScript_22D9DB:: @ 822D9DB end DesertRuins_EventScript_22D9EE:: @ 822D9EE - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index f14dbbfe8..41abdcede 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -22,53 +22,53 @@ DewfordTown_EventScript_1E9511:: @ 81E9511 end DewfordTown_EventScript_1E955A:: @ 81E955A - msgbox DewfordTown_Text_1E9CE5, 4 + msgbox DewfordTown_Text_1E9CE5, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 release end DewfordTown_EventScript_1E956A:: @ 81E956A - msgbox DewfordTown_Text_1E9D3A, 4 + msgbox DewfordTown_Text_1E9D3A, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E96E7 release end DewfordTown_EventScript_1E957A:: @ 81E957A - msgbox DewfordTown_Text_1E9D8F, 4 + msgbox DewfordTown_Text_1E9D8F, MSGBOX_DEFAULT closemessage release end DewfordTown_EventScript_1E9585:: @ 81E9585 - msgbox DewfordTown_Text_1E9B24, 5 + msgbox DewfordTown_Text_1E9B24, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95A2 - msgbox DewfordTown_Text_1E9BD9, 4 + msgbox DewfordTown_Text_1E9BD9, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E95A2:: @ 81E95A2 - msgbox DewfordTown_Text_1E9B7F, 4 + msgbox DewfordTown_Text_1E9B7F, MSGBOX_DEFAULT closemessage goto DewfordTown_EventScript_1E9660 end DewfordTown_EventScript_1E95B1:: @ 81E95B1 - msgbox DewfordTown_Text_1E99A8, 2 + msgbox DewfordTown_Text_1E99A8, MSGBOX_NPC end DewfordTown_EventScript_1E95BA:: @ 81E95BA - msgbox DewfordTown_Text_1E9A0F, 3 + msgbox DewfordTown_Text_1E9A0F, MSGBOX_SIGN end DewfordTown_EventScript_1E95C3:: @ 81E95C3 - msgbox DewfordTown_Text_1E9A3D, 3 + msgbox DewfordTown_Text_1E9A3D, MSGBOX_SIGN end DewfordTown_EventScript_1E95CC:: @ 81E95CC - msgbox DewfordTown_Text_1E9A7F, 3 + msgbox DewfordTown_Text_1E9A7F, MSGBOX_SIGN end DewfordTown_EventScript_1E95D5:: @ 81E95D5 @@ -76,7 +76,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 faceplayer checkflag FLAG_0x101 goto_eq DewfordTown_EventScript_1E962A - msgbox DewfordTown_Text_1E9DD1, 5 + msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E95FF compare VAR_RESULT, 0 @@ -84,15 +84,15 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 end DewfordTown_EventScript_1E95FF:: @ 81E95FF - msgbox DewfordTown_Text_1E9E14, 4 + msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD setflag FLAG_0x101 - msgbox DewfordTown_Text_1E9E65, 4 + msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9620:: @ 81E9620 - msgbox DewfordTown_Text_1E9F92, 4 + msgbox DewfordTown_Text_1E9F92, MSGBOX_DEFAULT release end @@ -107,12 +107,12 @@ DewfordTown_EventScript_1E962A:: @ 81E962A end DewfordTown_EventScript_1E964C:: @ 81E964C - msgbox DewfordTown_Text_1E9FD0, 4 + msgbox DewfordTown_Text_1E9FD0, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9656:: @ 81E9656 - msgbox DewfordTown_Text_1EA004, 4 + msgbox DewfordTown_Text_1EA004, MSGBOX_DEFAULT release end @@ -189,11 +189,11 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 end DewfordTown_EventScript_1E9790:: @ 81E9790 - msgbox DewfordTown_Text_1EEC1D, 4 + msgbox DewfordTown_Text_1EEC1D, MSGBOX_DEFAULT return DewfordTown_EventScript_1E9799:: @ 81E9799 - msgbox DewfordTown_Text_1EEDA7, 4 + msgbox DewfordTown_Text_1EEDA7, MSGBOX_DEFAULT return DewfordTown_Movement_1E97A2: @ 81E97A2 @@ -598,7 +598,7 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 lock faceplayer call DewfordTown_EventScript_271E8B - msgbox DewfordTown_Text_1EA136, 5 + msgbox DewfordTown_Text_1EA136, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_EventScript_1E9948 compare VAR_RESULT, 0 @@ -606,12 +606,12 @@ DewfordTown_EventScript_1E9922:: @ 81E9922 end DewfordTown_EventScript_1E9948:: @ 81E9948 - msgbox DewfordTown_Text_1EA491, 4 + msgbox DewfordTown_Text_1EA491, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9952:: @ 81E9952 - msgbox DewfordTown_Text_1EA242, 4 + msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT setvar VAR_0x8004, 9 call DewfordTown_EventScript_271E7C lock @@ -626,17 +626,17 @@ DewfordTown_EventScript_1E997D:: @ 81E997D incrementgamestat 2 compare VAR_0x8004, 0 goto_eq DewfordTown_EventScript_1E999E - msgbox DewfordTown_Text_1EA2AA, 4 + msgbox DewfordTown_Text_1EA2AA, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E9994:: @ 81E9994 - msgbox DewfordTown_Text_1EA443, 4 + msgbox DewfordTown_Text_1EA443, MSGBOX_DEFAULT release end DewfordTown_EventScript_1E999E:: @ 81E999E - msgbox DewfordTown_Text_1EA3FE, 4 + msgbox DewfordTown_Text_1EA3FE, MSGBOX_DEFAULT release end @@ -656,12 +656,12 @@ DewfordTown_Text_1E9A3D: @ 81E9A3D DewfordTown_Text_1E9A7F: @ 81E9A7F .string "DEWFORD HALL\n" - .string "“Everyone’s information exchange!”$" + .string "“Everyone's information exchange!”$" Route104_Text_1E9AAF: @ 81E9AAF .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD.\p" - .string "I suppose you’re off to deliver that\n" + .string "We've hit land in DEWFORD.\p" + .string "I suppose you're off to deliver that\n" .string "LETTER to, who was it now, STEVEN!$" DewfordTown_Text_1E9B24: @ 81E9B24 @@ -673,33 +673,33 @@ DewfordTown_Text_1E9B24: @ 81E9B24 DewfordTown_Text_1E9B7F: @ 81E9B7F .string "MR. BRINEY: PETALBURG it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9BD9: @ 81E9BD9 .string "MR. BRINEY: Then you go on and deliver\n" - .string "the LETTER. I’ll be waiting.$" + .string "the LETTER. I'll be waiting.$" Route104_Text_1E9C1D: @ 81E9C1D Route109_Text_1E9C1D: @ 81E9C1D .string "MR. BRINEY: Ahoy!\n" - .string "We’ve hit land in DEWFORD!\p" + .string "We've hit land in DEWFORD!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" DewfordTown_Text_1E9C8A: @ 81E9C8A .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" DewfordTown_Text_1E9CE5: @ 81E9CE5 .string "MR. BRINEY: PETALBURG, is it?\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9D3A: @ 81E9D3A .string "MR. BRINEY: SLATEPORT, is it?\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" DewfordTown_Text_1E9D8F: @ 81E9D8F .string "MR. BRINEY: You just tell me whenever\n" @@ -711,11 +711,11 @@ DewfordTown_Text_1E9DD1: @ 81E9DD1 DewfordTown_Text_1E9E14: @ 81E9E14 .string "I hear you, and I like what\n" - .string "you’re saying!\p" - .string "I’ll give you one of my fishing RODS.$" + .string "you're saying!\p" + .string "I'll give you one of my fishing RODS.$" DewfordTown_Text_1E9E65: @ 81E9E65 - .string "And, as an added bonus, I’ll even throw\n" + .string "And, as an added bonus, I'll even throw\n" .string "in a little fishing advice!\p" .string "First, you want to face the water,\n" .string "then use the ROD.\p" @@ -728,19 +728,19 @@ DewfordTown_Text_1E9E65: @ 81E9E65 DewfordTown_Text_1E9F92: @ 81E9F92 .string "Oh, is that so?\n" - .string "That’s too bad, then.$" + .string "That's too bad, then.$" DewfordTown_Text_1E9FB8: @ 81E9FB8 .string "Yo!\n" - .string "How’s your fishing?$" + .string "How's your fishing?$" DewfordTown_Text_1E9FD0: @ 81E9FD0 - .string "Is that right! That’s great!\n" + .string "Is that right! That's great!\n" .string "Haul in some big ones!$" DewfordTown_Text_1EA004: @ 81EA004 - .string "Oh, hey, don’t get down on yourself!\n" - .string "I’ll give you a little fishing advice.\p" + .string "Oh, hey, don't get down on yourself!\n" + .string "I'll give you a little fishing advice.\p" .string "First, you want to face the water,\n" .string "then use the ROD.\p" .string "Focus your mind…\n" @@ -751,49 +751,49 @@ DewfordTown_Text_1EA004: @ 81EA004 .string "to haul them in.$" DewfordTown_Text_1EA136: @ 81EA136 - .string "I like what’s hip, happening, and trendy.\n" - .string "I’m always checking it out.\p" + .string "I like what's hip, happening, and trendy.\n" + .string "I'm always checking it out.\p" .string "Listen, have you heard about this new\n" .string "“{STR_VAR_1}”?\p" - .string "That’s right!\n" + .string "That's right!\n" .string "Of course you know!\p" .string "I mean, sheesh,\n" .string "“{STR_VAR_1}”…\l" - .string "It’s the hottest thing in cool!\p" - .string "Wherever you’re from,\n" + .string "It's the hottest thing in cool!\p" + .string "Wherever you're from,\n" .string "“{STR_VAR_1}”\l" .string "is the biggest happening thing, right?$" DewfordTown_Text_1EA242: @ 81EA242 .string "Hunh?\n" - .string "It’s not the hip and happening thing?\p" + .string "It's not the hip and happening thing?\p" .string "Well, hey, you have to tell me,\n" - .string "what’s new and what’s “in”?$" + .string "what's new and what's “in”?$" DewfordTown_Text_1EA2AA: @ 81EA2AA .string "Hunh?\n" .string "“{STR_VAR_2}”?\p" .string "… …\p" - .string "…Uh… Yeah! That’s right!\n" + .string "…Uh… Yeah! That's right!\n" .string "Yeah, I knew that! Knew it all along!\p" .string "Of course I know about that!\n" .string "“{STR_VAR_2},” right?\p" - .string "Yeah, that’s it, it’s there!\n" - .string "Isn’t “{STR_VAR_2}”\l" + .string "Yeah, that's it, it's there!\n" + .string "Isn't “{STR_VAR_2}”\l" .string "the coolest, or what?\p" - .string "It’s the hippest thing in hip.\n" - .string "You think I’d not know about it?\p" + .string "It's the hippest thing in hip.\n" + .string "You think I'd not know about it?\p" .string "“{STR_VAR_1}”…\n" - .string "It’s, like, so five minutes ago.\p" + .string "It's, like, so five minutes ago.\p" .string "Now, “{STR_VAR_2}” is\n" - .string "what’s vital and in tune with the times!$" + .string "what's vital and in tune with the times!$" DewfordTown_Text_1EA3FE: @ 81EA3FE .string "Hmm…\n" .string "“{STR_VAR_2},” huh?\p" .string "But personally, I think\n" .string "“{STR_VAR_1}”\l" - .string "is what’s real in cool.$" + .string "is what's real in cool.$" DewfordTown_Text_1EA443: @ 81EA443 .string "Well, if you hear of any happening new\n" diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 6acd67792..703888e98 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -156,13 +156,13 @@ DewfordTown_Gym_EventScript_1FC7C1:: @ 81FC7C1 return DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 - trainerbattle 1, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7 + trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FCF44, DewfordTown_Gym_Text_1FD008, DewfordTown_Gym_EventScript_1FC7F7, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq DewfordTown_Gym_EventScript_1FC89C checkflag FLAG_0x0A6 goto_if 0, DewfordTown_Gym_EventScript_1FC878 - msgbox DewfordTown_Gym_Text_1FD20D, 4 + msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 message DewfordTown_Gym_Text_1FD07D waitmessage call DewfordTown_Gym_EventScript_27207E - msgbox DewfordTown_Gym_Text_1FD0A8, 4 + msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT setflag FLAG_0x4F1 setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 @@ -183,7 +183,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox DewfordTown_Gym_Text_1FD1E0, 4 + msgbox DewfordTown_Gym_Text_1FD1E0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_27205E - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 return @@ -205,19 +205,19 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 giveitem_std ITEM_TM08 compare VAR_RESULT, 0 goto_eq DewfordTown_Gym_EventScript_272054 - msgbox DewfordTown_Gym_Text_1FD181, 4 + msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT setflag FLAG_0x0A6 release end DewfordTown_Gym_EventScript_1FC89C:: @ 81FC89C - trainerbattle 7, TRAINER_BRAWLY_1, 0, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE - msgbox DewfordTown_Gym_Text_1FD37B, 6 + trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_1FD2C4, DewfordTown_Gym_Text_1FD367, DewfordTown_Gym_Text_1FD3DE + msgbox DewfordTown_Gym_Text_1FD37B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8B7:: @ 81FC8B7 - trainerbattle 2, TRAINER_TAKAO, 0, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 - msgbox DewfordTown_Gym_Text_1FCBCA, 6 + trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_1FCB9F, DewfordTown_Gym_Text_1FCBB8, DewfordTown_Gym_EventScript_1FC8D2 + msgbox DewfordTown_Gym_Text_1FCBCA, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 @@ -226,8 +226,8 @@ DewfordTown_Gym_EventScript_1FC8D2:: @ 81FC8D2 end DewfordTown_Gym_EventScript_1FC8D9:: @ 81FC8D9 - trainerbattle 2, TRAINER_JOCELYN, 0, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 - msgbox DewfordTown_Gym_Text_1FCC6B, 6 + trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_1FCC0A, DewfordTown_Gym_Text_1FCC45, DewfordTown_Gym_EventScript_1FC8F4 + msgbox DewfordTown_Gym_Text_1FCC6B, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 @@ -236,8 +236,8 @@ DewfordTown_Gym_EventScript_1FC8F4:: @ 81FC8F4 end DewfordTown_Gym_EventScript_1FC8FB:: @ 81FC8FB - trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 - msgbox DewfordTown_Gym_Text_1FCD4F, 6 + trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1FCD01, DewfordTown_Gym_Text_1FCD3C, DewfordTown_Gym_EventScript_1FC916 + msgbox DewfordTown_Gym_Text_1FCD4F, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 @@ -246,8 +246,8 @@ DewfordTown_Gym_EventScript_1FC916:: @ 81FC916 end DewfordTown_Gym_EventScript_1FC91D:: @ 81FC91D - trainerbattle 2, TRAINER_BRENDEN, 0, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 - msgbox DewfordTown_Gym_Text_1FCEAB, 6 + trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_1FCE48, DewfordTown_Gym_Text_1FCE75, DewfordTown_Gym_EventScript_1FC938 + msgbox DewfordTown_Gym_Text_1FCEAB, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 @@ -256,8 +256,8 @@ DewfordTown_Gym_EventScript_1FC938:: @ 81FC938 end DewfordTown_Gym_EventScript_1FC93F:: @ 81FC93F - trainerbattle 2, TRAINER_CRISTIAN, 0, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A - msgbox DewfordTown_Gym_Text_1FCF26, 6 + trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_1FCEDC, DewfordTown_Gym_Text_1FCF0A, DewfordTown_Gym_EventScript_1FC95A + msgbox DewfordTown_Gym_Text_1FCF26, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A @@ -266,8 +266,8 @@ DewfordTown_Gym_EventScript_1FC95A:: @ 81FC95A end DewfordTown_Gym_EventScript_1FC961:: @ 81FC961 - trainerbattle 2, TRAINER_LILITH, 0, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C - msgbox DewfordTown_Gym_Text_1FCE08, 6 + trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_1FCDB8, DewfordTown_Gym_Text_1FCDE5, DewfordTown_Gym_EventScript_1FC97C + msgbox DewfordTown_Gym_Text_1FCE08, MSGBOX_AUTOCLOSE end DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C @@ -280,12 +280,12 @@ DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 faceplayer checkflag FLAG_0x4F1 goto_eq DewfordTown_Gym_EventScript_1FC998 - msgbox DewfordTown_Gym_Text_1FC9D6, 4 + msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end DewfordTown_Gym_EventScript_1FC998:: @ 81FC998 - msgbox DewfordTown_Gym_Text_1FCB5C, 4 + msgbox DewfordTown_Gym_Text_1FCB5C, MSGBOX_DEFAULT release end @@ -304,33 +304,33 @@ DewfordTown_Gym_EventScript_1FC9B2:: @ 81FC9B2 end DewfordTown_Gym_EventScript_1FC9C2:: @ 81FC9C2 - msgbox DewfordTown_Gym_Text_1FD28B, 4 + msgbox DewfordTown_Gym_Text_1FD28B, MSGBOX_DEFAULT releaseall end DewfordTown_Gym_EventScript_1FC9CC:: @ 81FC9CC - msgbox DewfordTown_Gym_Text_1FD272, 4 + msgbox DewfordTown_Gym_Text_1FD272, MSGBOX_DEFAULT releaseall end DewfordTown_Gym_Text_1FC9D6: @ 81FC9D6 - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "DEWFORD’s GYM LEADER BRAWLY commands\n" + .string "DEWFORD's GYM LEADER BRAWLY commands\n" .string "FIGHTING-type POKéMON.\p" .string "Going against him with NORMAL-type\n" .string "POKéMON is asking for trouble.\p" .string "FIGHTING POKéMON will lay a serious\n" .string "smack down on NORMAL POKéMON,\l" .string "so be careful!\p" - .string "What’s worse, the GYM is as dark as\n" + .string "What's worse, the GYM is as dark as\n" .string "the ocean floor.\p" .string "But it will get brighter after defeating\n" .string "the TRAINERS in your way.\p" .string "Hey, okay, go for it!$" DewfordTown_Gym_Text_1FCB5C: @ 81FCB5C - .string "Whoah! It’s turned too bright in here!\p" + .string "Whoah! It's turned too bright in here!\p" .string "Your future is bright, too!$" DewfordTown_Gym_Text_1FCB9F: @ 81FCB9F @@ -345,24 +345,24 @@ DewfordTown_Gym_Text_1FCBCA: @ 81FCBCA .string "Your technique is commendable!$" DewfordTown_Gym_Text_1FCC0A: @ 81FCC0A - .string "There’s no need for BRAWLY to be\n" + .string "There's no need for BRAWLY to be\n" .string "involved!\p" - .string "I’ll crush you!$" + .string "I'll crush you!$" DewfordTown_Gym_Text_1FCC45: @ 81FCC45 .string "But… How?\n" .string "How could I lose so easily?$" DewfordTown_Gym_Text_1FCC6B: @ 81FCC6B - .string "I’m not going to waste this loss.\n" - .string "I’ll use it to motivate me to train!\p" - .string "One day I’ll become a GYM LEADER…\p" - .string "No, I’ll become the POKéMON LEAGUE\n" + .string "I'm not going to waste this loss.\n" + .string "I'll use it to motivate me to train!\p" + .string "One day I'll become a GYM LEADER…\p" + .string "No, I'll become the POKéMON LEAGUE\n" .string "CHAMPION!$" DewfordTown_Gym_Text_1FCD01: @ 81FCD01 - .string "Don’t you dare brush me off!\n" - .string "It’s not my fault if you cry!$" + .string "Don't you dare brush me off!\n" + .string "It's not my fault if you cry!$" DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C .string "Waaaaaaah!\n" @@ -371,8 +371,8 @@ DewfordTown_Gym_Text_1FCD3C: @ 81FCD3C DewfordTown_Gym_Text_1FCD4F: @ 81FCD4F .string "I battle in the dark to make my heart\n" .string "stronger.\p" - .string "But because it’s so dark, I can never\n" - .string "see BRAWLY’s face…$" + .string "But because it's so dark, I can never\n" + .string "see BRAWLY's face…$" DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 .string "Ufufu…\n" @@ -380,22 +380,22 @@ DewfordTown_Gym_Text_1FCDB8: @ 81FCDB8 DewfordTown_Gym_Text_1FCDE5: @ 81FCDE5 .string "Oh, you…\n" - .string "I don’t want to know you!$" + .string "I don't want to know you!$" DewfordTown_Gym_Text_1FCE08: @ 81FCE08 .string "You deserve to stay lost and end up\n" .string "back at the entrance again!$" DewfordTown_Gym_Text_1FCE48: @ 81FCE48 - .string "I’ll show you the gumption of\n" + .string "I'll show you the gumption of\n" .string "a sailing man!$" DewfordTown_Gym_Text_1FCE75: @ 81FCE75 - .string "How’d this happen?\n" - .string "It’s not like me to lose this way!$" + .string "How'd this happen?\n" + .string "It's not like me to lose this way!$" DewfordTown_Gym_Text_1FCEAB: @ 81FCEAB - .string "Oh, aye! You’re worthy of seeing\n" + .string "Oh, aye! You're worthy of seeing\n" .string "our GYM LEADER.$" DewfordTown_Gym_Text_1FCEDC: @ 81FCEDC @@ -411,19 +411,19 @@ DewfordTown_Gym_Text_1FCF26: @ 81FCF26 .string "Go after that BADGE!$" DewfordTown_Gym_Text_1FCF44: @ 81FCF44 - .string "I’m BRAWLY!\n" - .string "DEWFORD’s GYM LEADER!\p" - .string "I’ve been churned in the rough waves\n" - .string "of these parts, and I’ve grown tough\l" + .string "I'm BRAWLY!\n" + .string "DEWFORD's GYM LEADER!\p" + .string "I've been churned in the rough waves\n" + .string "of these parts, and I've grown tough\l" .string "in the pitch-black cave!\p" .string "So you wanted to challenge me?\n" - .string "Let me see what you’re made of!$" + .string "Let me see what you're made of!$" DewfordTown_Gym_Text_1FD008: @ 81FD008 .string "Whoah, wow! You made a much bigger\n" .string "splash than I expected!\p" .string "You swamped me!\p" - .string "Okay, you’ve got me.\n" + .string "Okay, you've got me.\n" .string "Take this GYM BADGE!$" DewfordTown_Gym_Text_1FD07D: @ 81FD07D @@ -434,14 +434,14 @@ DewfordTown_Gym_Text_1FD0A8: @ 81FD0A8 .string "The KNUCKLE BADGE makes all POKéMON\n" .string "up to Level 30, even those you get in\l" .string "trades, obey without question.\p" - .string "And, you’ll be able to use the HM move\n" + .string "And, you'll be able to use the HM move\n" .string "FLASH outside of battle.\p" - .string "If you’d like, use this TECHNICAL\n" + .string "If you'd like, use this TECHNICAL\n" .string "MACHINE, too.$" DewfordTown_Gym_Text_1FD181: @ 81FD181 .string "That TM08 contains BULK UP.\p" - .string "It’s a move that raises both ATTACK\n" + .string "It's a move that raises both ATTACK\n" .string "and DEFENSE stats.\p" .string "… … … … … …$" @@ -459,7 +459,7 @@ DewfordTown_Gym_Text_1FD272: @ 81FD272 DewfordTown_Gym_Text_1FD28B: @ 81FD28B .string "DEWFORD TOWN POKéMON GYM\p" - .string "BRAWLY’S CERTIFIED TRAINERS:\n" + .string "BRAWLY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 @@ -468,16 +468,16 @@ DewfordTown_Gym_Text_1FD2C4: @ 81FD2C4 .string "A giant wave of a talent like you…\n" .string "I knew you would return!\p" .string "Show me how much higher\n" - .string "you’ve gone!$" + .string "you've gone!$" DewfordTown_Gym_Text_1FD367: @ 81FD367 .string "Wow!\n" .string "Swamped again!$" DewfordTown_Gym_Text_1FD37B: @ 81FD37B - .string "BRAWLY: Battling is vast and it’s deep.\n" - .string "You can’t see the bottom.\l" - .string "It’s just like the sea of HOENN!$" + .string "BRAWLY: Battling is vast and it's deep.\n" + .string "You can't see the bottom.\l" + .string "It's just like the sea of HOENN!$" DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE .string "BRAWLY: A wave may draw back, but it\n" @@ -486,6 +486,6 @@ DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE .string "I knew you would return!\p" .string "Oh? You only have one POKéMON\n" .string "that can battle.\p" - .string "I’m sorry, but I’d like you to come back\n" + .string "I'm sorry, but I'd like you to come back\n" .string "with at least two POKéMON.$" diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index d8c19f1fe..bec9826f3 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -8,12 +8,12 @@ DewfordTown_Hall_EventScript_1FD4D0:: @ 81FD4D0 special TrendyPhraseIsOld compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD4EF - msgbox DewfordTown_Hall_Text_1FD818, 4 + msgbox DewfordTown_Hall_Text_1FD818, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD4EF:: @ 81FD4EF - msgbox DewfordTown_Hall_Text_1FD877, 4 + msgbox DewfordTown_Hall_Text_1FD877, MSGBOX_DEFAULT release end @@ -21,7 +21,7 @@ DewfordTown_Hall_EventScript_1FD4F9:: @ 81FD4F9 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FD8ED, 4 + msgbox DewfordTown_Hall_Text_1FD8ED, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A faceplayer call DewfordTown_Hall_EventScript_271E8B special sub_811EF6C - msgbox DewfordTown_Hall_Text_1FD948, 5 + msgbox DewfordTown_Hall_Text_1FD948, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq DewfordTown_Hall_EventScript_1FD533 compare VAR_RESULT, 0 @@ -38,12 +38,12 @@ DewfordTown_Hall_EventScript_1FD50A:: @ 81FD50A end DewfordTown_Hall_EventScript_1FD533:: @ 81FD533 - msgbox DewfordTown_Hall_Text_1FD9B3, 4 + msgbox DewfordTown_Hall_Text_1FD9B3, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD53D:: @ 81FD53D - msgbox DewfordTown_Hall_Text_1FDA06, 4 + msgbox DewfordTown_Hall_Text_1FDA06, MSGBOX_DEFAULT release end @@ -51,7 +51,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA5C, 4 + msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT closemessage applymovement 4, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -62,7 +62,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563 lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDA99, 4 + msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT closemessage applymovement 5, DewfordTown_Hall_Movement_2725A6 waitmovement 0 @@ -73,14 +73,14 @@ DewfordTown_Hall_EventScript_1FD57F:: @ 81FD57F lock faceplayer call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDAC4, 4 + msgbox DewfordTown_Hall_Text_1FDAC4, MSGBOX_DEFAULT release end DewfordTown_Hall_EventScript_1FD590:: @ 81FD590 lockall call DewfordTown_Hall_EventScript_271E8B - msgbox DewfordTown_Hall_Text_1FDB89, 4 + msgbox DewfordTown_Hall_Text_1FDB89, MSGBOX_DEFAULT releaseall end @@ -100,22 +100,22 @@ DewfordTown_Hall_EventScript_1FD5A0:: @ 81FD5A0 end DewfordTown_Hall_EventScript_1FD607:: @ 81FD607 - msgbox DewfordTown_Hall_Text_1FDC05, 4 + msgbox DewfordTown_Hall_Text_1FDC05, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD611:: @ 81FD611 - msgbox DewfordTown_Hall_Text_1FDC21, 4 + msgbox DewfordTown_Hall_Text_1FDC21, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD61B:: @ 81FD61B - msgbox DewfordTown_Hall_Text_1FDC3C, 4 + msgbox DewfordTown_Hall_Text_1FDC3C, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD625:: @ 81FD625 - msgbox DewfordTown_Hall_Text_1FDC57, 4 + msgbox DewfordTown_Hall_Text_1FDC57, MSGBOX_DEFAULT releaseall end @@ -147,41 +147,41 @@ DewfordTown_Hall_EventScript_1FD647:: @ 81FD647 DewfordTown_Hall_EventScript_1FD6AD:: @ 81FD6AD call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDC76, 4 + msgbox DewfordTown_Hall_Text_1FDC76, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDCE2, 4 + msgbox DewfordTown_Hall_Text_1FDCE2, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6C9:: @ 81FD6C9 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDD95, 4 + msgbox DewfordTown_Hall_Text_1FDD95, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDE0E, 4 + msgbox DewfordTown_Hall_Text_1FDE0E, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD6E5:: @ 81FD6E5 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDE77, 4 + msgbox DewfordTown_Hall_Text_1FDE77, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDED8, 4 + msgbox DewfordTown_Hall_Text_1FDED8, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD701:: @ 81FD701 call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FDF72, 4 + msgbox DewfordTown_Hall_Text_1FDF72, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FDFF1, 4 + msgbox DewfordTown_Hall_Text_1FDFF1, MSGBOX_DEFAULT releaseall end DewfordTown_Hall_EventScript_1FD71D:: @ 81FD71D call DewfordTown_Hall_EventScript_1FD73A - msgbox DewfordTown_Hall_Text_1FE09A, 4 + msgbox DewfordTown_Hall_Text_1FE09A, MSGBOX_DEFAULT call DewfordTown_Hall_EventScript_1FD772 - msgbox DewfordTown_Hall_Text_1FE0F2, 4 + msgbox DewfordTown_Hall_Text_1FE0F2, MSGBOX_DEFAULT releaseall end @@ -254,7 +254,7 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA call DewfordTown_Hall_EventScript_271E8B checkflag FLAG_RECEIVED_TM_36 goto_eq DewfordTown_Hall_EventScript_1FD80E - msgbox DewfordTown_Hall_Text_1FE142, 4 + msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 goto_eq DewfordTown_Hall_EventScript_272054 @@ -263,51 +263,51 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA end DewfordTown_Hall_EventScript_1FD80E:: @ 81FD80E - msgbox DewfordTown_Hall_Text_1FE1ED, 4 + msgbox DewfordTown_Hall_Text_1FE1ED, MSGBOX_DEFAULT release end DewfordTown_Hall_Text_1FD818: @ 81FD818 - .string "What’s in vogue? Why, it has to be\n" + .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" - .string "I can’t imagine what life would be like\n" + .string "I can't imagine what life would be like\n" .string "without “{STR_VAR_1}”!$" DewfordTown_Hall_Text_1FD877: @ 81FD877 - .string "What’s in vogue? Why, it has to be\n" + .string "What's in vogue? Why, it has to be\n" .string "“{STR_VAR_1}”!\p" - .string "But I’m getting kind of bored with it.\p" + .string "But I'm getting kind of bored with it.\p" .string "I should look for the next big thing.$" DewfordTown_Hall_Text_1FD8ED: @ 81FD8ED - .string "I’m teaching my POKéMON about\n" + .string "I'm teaching my POKéMON about\n" .string "“{STR_VAR_1},”\l" - .string "but it’s not going well.\p" - .string "It’s a bit too much, I think.$" + .string "but it's not going well.\p" + .string "It's a bit too much, I think.$" DewfordTown_Hall_Text_1FD948: @ 81FD948 - .string "I’m studying up on the hip and trendy\n" + .string "I'm studying up on the hip and trendy\n" .string "“{STR_VAR_1}” now.\p" - .string "Is it true that there’s a deep link\n" + .string "Is it true that there's a deep link\n" .string "between “{STR_VAR_1}”\l" .string "and “{STR_VAR_2}”?$" DewfordTown_Hall_Text_1FD9B3: @ 81FD9B3 .string "Oh!\n" .string "So, my hunch was right!\p" - .string "I’m one step closer to being hip and\n" + .string "I'm one step closer to being hip and\n" .string "happening, yowza!$" DewfordTown_Hall_Text_1FDA06: @ 81FDA06 .string "What?!\n" .string "Is that so?!\p" - .string "It’s not easy for an older fellow like\n" + .string "It's not easy for an older fellow like\n" .string "me to keep up with trends!$" DewfordTown_Hall_Text_1FDA5C: @ 81FDA5C .string "This whole business about\n" .string "“{STR_VAR_1}”…\l" - .string "Isn’t there a TV show on it?$" + .string "Isn't there a TV show on it?$" DewfordTown_Hall_Text_1FDA99: @ 81FDA99 .string "Across the sea…\p" @@ -326,7 +326,7 @@ DewfordTown_Hall_Text_1FDAC4: @ 81FDAC4 .string "“{STR_VAR_1}”\l" .string "picture books.\p" .string "Heheh, I own!\n" - .string "I’m not sharing anything with you!$" + .string "I'm not sharing anything with you!$" DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "IDENTIFYING GOOD\n" @@ -337,29 +337,29 @@ DewfordTown_Hall_Text_1FDB89: @ 81FDB89 .string "POKéMON…\p" .string "USEFUL\n" .string "“{STR_VAR_1}”…\p" - .string "It’s neatly jammed with books about\n" + .string "It's neatly jammed with books about\n" .string "“{STR_VAR_1}.”$" DewfordTown_Hall_Text_1FDC05: @ 81FDC05 - .string "“{STR_VAR_1}’S\n" + .string "“{STR_VAR_1}'S\n" .string "SCREAM” is the title.$" DewfordTown_Hall_Text_1FDC21: @ 81FDC21 - .string "“{STR_VAR_1}’S\n" + .string "“{STR_VAR_1}'S\n" .string "SMILE” is the title.$" DewfordTown_Hall_Text_1FDC3C: @ 81FDC3C - .string "It’s titled “THE LAST\n" + .string "It's titled “THE LAST\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_1FDC57: @ 81FDC57 - .string "It’s titled “THE BIRTH OF\n" + .string "It's titled “THE BIRTH OF\n" .string "{STR_VAR_1}”.$" DewfordTown_Hall_Text_1FDC76: @ 81FDC76 .string "I saw “{STR_VAR_1}”!\n" .string "Cool, huh?\p" - .string "It’s, like, the coolest thing going!\p" + .string "It's, like, the coolest thing going!\p" .string "It was awesome!\n" .string "It was the real thing, oh yeah!$" @@ -367,11 +367,11 @@ DewfordTown_Hall_Text_1FDCE2: @ 81FDCE2 .string "Oh, no, no, no.\p" .string "That alleged\n" .string "“{STR_VAR_1}”\l" - .string "you claim to have seen--it’s not.\p" + .string "you claim to have seen--it's not.\p" .string "The authentic article is much…\n" .string "How should I say it?\l" .string "Sharper, yet more mellow!\p" - .string "Ah, no matter. It’s astonishing!$" + .string "Ah, no matter. It's astonishing!$" DewfordTown_Hall_Text_1FDD95: @ 81FDD95 .string "Hey, listen, I composed a theme song\n" @@ -409,7 +409,7 @@ DewfordTown_Hall_Text_1FDED8: @ 81FDED8 DewfordTown_Hall_Text_1FDF72: @ 81FDF72 .string "I was thinking, though…\p" - .string "Wouldn’t you agree that\n" + .string "Wouldn't you agree that\n" .string "“{STR_VAR_1}” has\l" .string "grown from being something trendy to\l" .string "being a part of our daily lives?$" @@ -417,33 +417,33 @@ DewfordTown_Hall_Text_1FDF72: @ 81FDF72 DewfordTown_Hall_Text_1FDFF1: @ 81FDFF1 .string "Beg pardon?\n" .string "That much, what?\p" - .string "However, it’s true that\n" + .string "However, it's true that\n" .string "“{STR_VAR_1}”\l" .string "weighs heavily on your mind, whether\l" - .string "you’re awake or asleep.\p" - .string "Absolutely, you’re the\n" + .string "you're awake or asleep.\p" + .string "Absolutely, you're the\n" .string "“{STR_VAR_1}”\l" .string "PROFESSOR, old sport!$" DewfordTown_Hall_Text_1FE09A: @ 81FE09A .string "If you and me team up as a combo,\n" - .string "we’ll be invincible when it comes to all\l" + .string "we'll be invincible when it comes to all\l" .string "things “{STR_VAR_1}”!$" DewfordTown_Hall_Text_1FE0F2: @ 81FE0F2 .string "Spot on, my friend!\p" .string "We shall be the\n" .string "“{STR_VAR_1}” DUO!\p" - .string "Isn’t that a ripe image?\n" + .string "Isn't that a ripe image?\n" .string "Hahahah!$" DewfordTown_Hall_Text_1FE142: @ 81FE142 .string "For me, SLUDGE BOMB is at the peak\n" - .string "of popularity. It’s the one.\p" - .string "Hunh? You’re telling me that you don’t\n" + .string "of popularity. It's the one.\p" + .string "Hunh? You're telling me that you don't\n" .string "know about SLUDGE BOMB?\p" - .string "That’s outright pitiful.\n" - .string "I’ll give you one.$" + .string "That's outright pitiful.\n" + .string "I'll give you one.$" DewfordTown_Hall_Text_1FE1ED: @ 81FE1ED .string "I love SLUDGE BOMB.\p" diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc index 59c490d81..32706dbde 100644 --- a/data/maps/DewfordTown_House1/scripts.inc +++ b/data/maps/DewfordTown_House1/scripts.inc @@ -2,11 +2,11 @@ DewfordTown_House1_MapScripts:: @ 81FC3CD .byte 0 DewfordTown_House1_EventScript_1FC3CE:: @ 81FC3CE - msgbox DewfordTown_House1_Text_1FC3F3, 2 + msgbox DewfordTown_House1_Text_1FC3F3, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3D7:: @ 81FC3D7 - msgbox DewfordTown_House1_Text_1FC45B, 2 + msgbox DewfordTown_House1_Text_1FC45B, MSGBOX_NPC end DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 @@ -14,13 +14,13 @@ DewfordTown_House1_EventScript_1FC3E0:: @ 81FC3E0 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox DewfordTown_House1_Text_1FC510, 4 + msgbox DewfordTown_House1_Text_1FC510, MSGBOX_DEFAULT waitmoncry release end DewfordTown_House1_Text_1FC3F3: @ 81FC3F3 - .string "There’s a lot to be said for living on\n" + .string "There's a lot to be said for living on\n" .string "a small island like this in harmony with\l" .string "POKéMON and the family.$" @@ -29,7 +29,7 @@ DewfordTown_House1_Text_1FC45B: @ 81FC45B .string "CITY when I married my husband here.\p" .string "Life goes by slowly on this little\n" .string "island. But being surrounded by the\l" - .string "beautiful sea--that’s happiness, too.$" + .string "beautiful sea--that's happiness, too.$" DewfordTown_House1_Text_1FC510: @ 81FC510 .string "ZIGZAGOON: Guguuh!$" diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index 1805164af..c0de82dac 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E faceplayer checkflag FLAG_0x121 goto_eq DewfordTown_House2_EventScript_1FE267 - msgbox DewfordTown_House2_Text_1FE27A, 4 + msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 goto_eq DewfordTown_House2_EventScript_1FE25D @@ -15,30 +15,30 @@ DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E end DewfordTown_House2_EventScript_1FE25D:: @ 81FE25D - msgbox DewfordTown_House2_Text_1FE356, 4 + msgbox DewfordTown_House2_Text_1FE356, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE267:: @ 81FE267 - msgbox DewfordTown_House2_Text_1FE3D1, 4 + msgbox DewfordTown_House2_Text_1FE3D1, MSGBOX_DEFAULT release end DewfordTown_House2_EventScript_1FE271:: @ 81FE271 - msgbox DewfordTown_House2_Text_1FE444, 2 + msgbox DewfordTown_House2_Text_1FE444, MSGBOX_NPC end DewfordTown_House2_Text_1FE27A: @ 81FE27A .string "Gorge your eyes on this!\p" - .string "It’s a SILK SCARF. It’s right at the\n" + .string "It's a SILK SCARF. It's right at the\n" .string "cutting edge of fashion, yeah!\p" .string "Oh, I can see your eyes twinkling!\n" .string "You appreciate my dazzling style!\p" - .string "Oh, you’re a delight!\n" + .string "Oh, you're a delight!\n" .string "Here you go. I want you to have it!$" DewfordTown_House2_Text_1FE356: @ 81FE356 - .string "Oh, you don’t have room?\p" + .string "Oh, you don't have room?\p" .string "Now, listen tight, this SCARF is a must-\n" .string "have! Why, I would sell all my items\l" .string "in order to get it!$" @@ -46,7 +46,7 @@ DewfordTown_House2_Text_1FE356: @ 81FE356 DewfordTown_House2_Text_1FE3D1: @ 81FE3D1 .string "The SILK SCARF raises the power of\n" .string "NORMAL-type moves.\p" - .string "It’s a marvelous SCARF that will go\n" + .string "It's a marvelous SCARF that will go\n" .string "with almost all POKéMON!$" DewfordTown_House2_Text_1FE444: @ 81FE444 @@ -54,6 +54,6 @@ DewfordTown_House2_Text_1FE444: @ 81FE444 .string "to visit DEWFORD?\p" .string "Did you maybe come here because you\n" .string "heard about BRAWLY?\p" - .string "He’s so cool…\n" + .string "He's so cool…\n" .string "Everyone idolizes him.$" diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index a9ce59bc1..e21fd13af 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -17,21 +17,21 @@ DewfordTown_PokemonCenter_1F_EventScript_1FC537:: @ 81FC537 end DewfordTown_PokemonCenter_1F_EventScript_1FC545:: @ 81FC545 - msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC557, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_EventScript_1FC54E:: @ 81FC54E - msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, 2 + msgbox DewfordTown_PokemonCenter_1F_Text_1FC5AE, MSGBOX_NPC end DewfordTown_PokemonCenter_1F_Text_1FC557: @ 81FC557 - .string "There’s a stone cavern at the edge\n" + .string "There's a stone cavern at the edge\n" .string "of town.\p" - .string "I’ve heard you can find rare stones\n" + .string "I've heard you can find rare stones\n" .string "there.$" DewfordTown_PokemonCenter_1F_Text_1FC5AE: @ 81FC5AE - .string "Even if a POKéMON faints and can’t\n" + .string "Even if a POKéMON faints and can't\n" .string "battle, it can still use a move learned\l" .string "from a HIDDEN MACHINE (HM).$" diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index 178621217..5bb85a3c1 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -8,15 +8,15 @@ EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 end EverGrandeCity_EventScript_1E7D2B:: @ 81E7D2B - msgbox EverGrandeCity_Text_1E7D4F, 3 + msgbox EverGrandeCity_Text_1E7D4F, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D34:: @ 81E7D34 - msgbox EverGrandeCity_Text_1E7D89, 3 + msgbox EverGrandeCity_Text_1E7D89, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D3D:: @ 81E7D3D - msgbox EverGrandeCity_Text_1E7D65, 3 + msgbox EverGrandeCity_Text_1E7D65, MSGBOX_SIGN end EverGrandeCity_EventScript_1E7D46:: @ 81E7D46 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 71a72b83c..250a3012b 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -39,8 +39,8 @@ EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, 4 - trainerbattle 3, TRAINER_WALLACE, 0, EverGrandeCity_ChampionsRoom_Text_228EAC + msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC goto EverGrandeCity_ChampionsRoom_EventScript_228A61 end @@ -49,7 +49,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender @@ -75,7 +75,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 return EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -83,12 +83,12 @@ EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_272598 @@ -96,7 +96,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB applymovement 2, EverGrandeCity_ChampionsRoom_Movement_27259A waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT goto EverGrandeCity_ChampionsRoom_EventScript_228B30 end @@ -107,15 +107,15 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725A8 waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725A6 waitmovement 0 delay 20 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B @@ -126,7 +126,7 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 delay 20 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_2725AA waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_228BEB @@ -143,11 +143,11 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 end EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, 4 + msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT return EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD @@ -231,7 +231,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C .string "That was superb work, putting an end\l" .string "to that crisis all by yourself.\p" .string "Oops!\p" - .string "It wouldn’t be fair to say that you\n" + .string "It wouldn't be fair to say that you\n" .string "alone ended the crisis.\p" .string "You overcame that difficult situation\n" .string "by working as one with your POKéMON.\p" @@ -274,7 +274,7 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA .string "MAY: {PLAYER}{KUN}!\p" - .string "Here’s some advice before you challenge\n" + .string "Here's some advice before you challenge\n" .string "the CHAMPION…$" EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B @@ -282,7 +282,7 @@ EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B .string "What, what, what?\p" .string "{PLAYER}{KUN}…\n" .string "Could it be that…\l" - .string "It’s already over?$" + .string "It's already over?$" EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 .string "BRENDAN: {PLAYER}!\p" @@ -292,19 +292,19 @@ EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 .string "BRENDAN: {PLAYER}…\p" .string "Are you trying to tell me…\n" - .string "You’ve beaten the CHAMPION?$" + .string "You've beaten the CHAMPION?$" EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 .string "PROF. BIRCH: See?\n" .string "What did I tell you, {RIVAL}?\p" - .string "Didn’t I tell you that you don’t need\n" + .string "Didn't I tell you that you don't need\n" .string "to worry about {PLAYER}{KUN}?\p" .string "… … … … … … … …\n" - .string "{PLAYER}{KUN}, you’ve finally done it.\p" + .string "{PLAYER}{KUN}, you've finally done it.\p" .string "When I heard that you defeated your\n" .string "own father at the PETALBURG GYM,\l" .string "I thought perhaps you had a chance…\p" - .string "But to think you’ve actually become\n" + .string "But to think you've actually become\n" .string "the CHAMPION!\p" .string "Ah, yes!\p" .string "What became of your POKéDEX?\n" @@ -322,25 +322,25 @@ EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 .string "Come with me.$" EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB - .string "WALLACE: I’m sorry, but…\p" + .string "WALLACE: I'm sorry, but…\p" .string "From here on, only those TRAINERS who\n" .string "have become CHAMPIONS may enter.\p" - .string "You’ll have to wait outside with\n" + .string "You'll have to wait outside with\n" .string "PROF. BIRCH.$" EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 .string "MAY: Groan…\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "I’m just joking! That’s okay!\n" - .string "That’s the rule!\p" + .string "I'm just joking! That's okay!\n" + .string "That's the rule!\p" .string "{PLAYER}{KUN}!\n" .string "Honestly, congratulations!$" EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 .string "BRENDAN: Whaaaat?! … … … … …\n" .string "… … … … … … … …\p" - .string "It can’t be helped if that’s the rule.\p" + .string "It can't be helped if that's the rule.\p" .string "{PLAYER}, way to go!\n" .string "Congratulations!$" diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4c90417af..b50e715aa 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -44,13 +44,13 @@ EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 checkflag FLAG_0x4FE goto_eq EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, 4 - trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_228895 + msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 goto EverGrandeCity_DrakesRoom_EventScript_228724 end EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end @@ -59,7 +59,7 @@ EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 special sub_813BF7C setflag FLAG_0x4FE call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, 4 + msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E .string "For us to battle with POKéMON as\n" .string "partners, do you know what it takes?\p" .string "Do you know what is needed?\p" - .string "If you don’t, then you will never\n" + .string "If you don't, then you will never\n" .string "prevail over me!$" EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index f1d846f03..141881cf9 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -44,27 +44,27 @@ EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 checkflag FLAG_0x4FD goto_eq EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, 4 - trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_2285B4 + msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 goto EverGrandeCity_GlaciasRoom_EventScript_22849A end EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A setflag FLAG_0x4FD call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, 4 + msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release end EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC .string "Welcome, my name is GLACIA\n" .string "of the ELITE FOUR.\p" - .string "I’ve traveled from afar to HOENN\n" + .string "I've traveled from afar to HOENN\n" .string "so that I may hone my ice skills.\p" .string "But all I have seen are challenges by\n" .string "weak TRAINERS and their POKéMON.\p" @@ -76,7 +76,7 @@ EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 .string "You and your POKéMON…\n" .string "How hot your spirits burn!\p" .string "The all-consuming heat overwhelms.\p" - .string "It’s no surprise that my icy skills\n" + .string "It's no surprise that my icy skills\n" .string "failed to harm you.$" EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 763d2ebb1..2a871e18f 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -23,7 +23,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_22990E, 4 + msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_229908 applymovement 255, EverGrandeCity_HallOfFame_Movement_229908 @@ -32,7 +32,7 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A8 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A4 waitmovement 0 - msgbox EverGrandeCity_HallOfFame_Text_2299A3, 4 + msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_2725A6 applymovement 255, EverGrandeCity_HallOfFame_Movement_2725A6 @@ -92,7 +92,7 @@ EverGrandeCity_HallOfFame_Text_22990E: @ 822990E .string "are honored.$" EverGrandeCity_HallOfFame_Text_2299A3: @ 82299A3 - .string "WALLACE: Come on, let’s record your\n" + .string "WALLACE: Come on, let's record your\n" .string "name as a TRAINER who triumphed over\l" .string "the POKéMON LEAGUE, and the names of\l" .string "the partners who battled with you.$" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 679e4f663..165c985ac 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -44,26 +44,26 @@ EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB checkflag FLAG_0x4FC goto_eq EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, 4 - trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_228325 + msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 goto EverGrandeCity_PhoebesRoom_EventScript_2281FC end EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC setflag FLAG_0x4FC call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, 4 + msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release end EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E .string "Ahahaha!\p" - .string "I’m PHOEBE of the ELITE FOUR.\n" + .string "I'm PHOEBE of the ELITE FOUR.\n" .string "I did my training on MT. PYRE.\p" .string "While I trained, I gained the ability\n" .string "to commune with GHOST-type POKéMON.\p" @@ -74,14 +74,14 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 .string "Oh, darn.\n" - .string "I’ve gone and lost.$" + .string "I've gone and lost.$" EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 - .string "There’s a definite bond between you\n" + .string "There's a definite bond between you\n" .string "and your POKéMON, too.\p" - .string "I didn’t recognize it, so it’s only\n" + .string "I didn't recognize it, so it's only\n" .string "natural that I lost.\p" - .string "Yup, I’d like to see how far your bond\n" + .string "Yup, I'd like to see how far your bond\n" .string "will carry you.\p" .string "Go ahead, move on to the next room.$" diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index aaec19840..3fb16a5ab 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -24,17 +24,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A59:: @ 8229A59 end EverGrandeCity_PokemonCenter_1F_EventScript_229A67:: @ 8229A67 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229ADA, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A70:: @ 8229A70 - msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, 2 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229B62, MSGBOX_NPC end EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 lock faceplayer - msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, 4 + msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 @@ -81,24 +81,24 @@ EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA .string "The POKéMON LEAGUE is only a short\n" .string "distance after the VICTORY ROAD.\p" - .string "If you’ve come this far, what choice\n" + .string "If you've come this far, what choice\n" .string "do you have but to keep going?$" EverGrandeCity_PokemonCenter_1F_Text_229B62: @ 8229B62 .string "The long and harrowing VICTORY ROAD…\p" - .string "It’s like reliving the path one has\n" + .string "It's like reliving the path one has\n" .string "traveled in life…\p" .string "Believe in your POKéMON and give it\n" .string "your very best!$" EverGrandeCity_PokemonCenter_1F_Text_229BF1: @ 8229BF1 - .string "SCOTT: {PLAYER}{KUN}, you’ve clawed your\n" + .string "SCOTT: {PLAYER}{KUN}, you've clawed your\n" .string "way up to face the POKéMON LEAGUE!\p" - .string "I’m happy for you!\n" + .string "I'm happy for you!\n" .string "You made my cheering worthwhile!\p" .string "{PLAYER}{KUN}, if you were to become\n" .string "the POKéMON LEAGUE CHAMPION…\p" - .string "I’ll get in touch with you then.\p" + .string "I'll get in touch with you then.\p" .string "Okay, {PLAYER}{KUN}.\n" .string "Go for greatness!$" diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index b4046d022..0f3f6c33e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -29,7 +29,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_22960A:: @ 822960A message gUnknown_08272A21 waitmessage pokemart EverGrandeCity_PokemonLeague_1F_Pokemart_229624 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -88,14 +88,14 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296A3:: @ 82296A3 EverGrandeCity_PokemonLeague_1F_EventScript_2296AE:: @ 82296AE playse SE_HAZURE - msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_229787, MSGBOX_DEFAULT releaseall end EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_27259E waitmovement 0 - msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, 4 + msgbox EverGrandeCity_PokemonLeague_1F_Text_2297EF, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_1F_Movement_2725A2 waitmovement 0 @@ -132,8 +132,8 @@ EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 .string "all the GYM BADGES.$" EverGrandeCity_PokemonLeague_1F_Text_229787: @ 8229787 - .string "You haven’t obtained all the BADGES.\p" - .string "If you’re bound for the POKéMON\n" + .string "You haven't obtained all the BADGES.\p" + .string "If you're bound for the POKéMON\n" .string "LEAGUE, you must return with them.$" EverGrandeCity_PokemonLeague_1F_Text_2297EF: @ 82297EF diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 5513d3c24..b283f166e 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -51,41 +51,41 @@ EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 checkflag FLAG_0x4FB goto_eq EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, 4 - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_2280A2 + msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 goto EverGrandeCity_SidneysRoom_EventScript_227F95 end EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 setflag FLAG_0x4FB call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, 4 + msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release end EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 .string "Welcome, challenger!\n" - .string "I’m SIDNEY of the ELITE FOUR.\p" - .string "I like that look you’re giving me.\n" - .string "I guess you’ll give me a good match.\l" - .string "That’s good! Looking real good!\p" - .string "All right! You and me, let’s enjoy\n" + .string "I'm SIDNEY of the ELITE FOUR.\p" + .string "I like that look you're giving me.\n" + .string "I guess you'll give me a good match.\l" + .string "That's good! Looking real good!\p" + .string "All right! You and me, let's enjoy\n" .string "a battle that can only be staged\l" .string "here in the POKéMON LEAGUE!$" EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 .string "Well, how do you like that? I lost!\n" - .string "Eh, it was fun, so it doesn’t matter.$" + .string "Eh, it was fun, so it doesn't matter.$" EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC .string "Well, listen to what this loser has\n" .string "to say.\p" - .string "You’ve got what it takes to go far.\n" + .string "You've got what it takes to go far.\n" .string "Now, go on to the next room and enjoy\l" .string "your next battle!$" diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 21cea72e1..7a9d0b444 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,31 +35,31 @@ 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 - .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.”$" diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 8bbcef830..f3e1edbbf 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -51,10 +51,10 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F playse SE_W187 waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, MSGBOX_DEFAULT setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call FallarborTown_BattleTentBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -65,7 +65,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F waitmovement 0 setvar VAR_0x8004, 6 special sub_81B9B80 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CCE, MSGBOX_DEFAULT FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E setvar VAR_0x8004, 2 @@ -81,7 +81,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20099C:: @ 820099C playse SE_BAN waitse waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CB3, MSGBOX_DEFAULT closemessage FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 @@ -102,7 +102,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3 waitmovement 0 applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94 waitmovement 0 - msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4 + msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -127,7 +127,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200A2A:: @ 8200A2A case 2, FallarborTown_BattleTentBattleRoom_EventScript_200AA6 FallarborTown_BattleTentBattleRoom_EventScript_200A78:: @ 8200A78 - msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, 5 + msgbox FallarborTown_BattleTentBattleRoom_Text_257E6B, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentBattleRoom_EventScript_200A2A case 1, FallarborTown_BattleTentBattleRoom_EventScript_200B51 diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc index f1a144a14..d21216208 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc @@ -53,10 +53,10 @@ FallarborTown_BattleTentCorridor_Text_200791: @ 8200791 .string "You can check them on your POKéNAV.$" FallarborTown_BattleTentCorridor_Text_200802: @ 8200802 - .string "I can’t beat GYM LEADERS…\p" - .string "I can’t win any CONTESTS…\p" - .string "I’ve been here, there, and everywhere,\n" - .string "and it’s all for naught…$" + .string "I can't beat GYM LEADERS…\p" + .string "I can't win any CONTESTS…\p" + .string "I've been here, there, and everywhere,\n" + .string "and it's all for naught…$" FallarborTown_BattleTentCorridor_Text_200876: @ 8200876 .string "POKéMON CONTESTS\n" diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 7c75ae4f0..aed9aa93f 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEAF:: @ 81FFEAF FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4DED, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4DED, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -43,7 +43,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEB8:: @ 81FFEB8 FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT message FallarborTown_BattleTentLobby_Text_2C4EFF waitmessage setvar VAR_0x8004, 4 @@ -59,7 +59,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED waitse FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 - msgbox FallarborTown_BattleTentLobby_Text_2C4F22, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9B80 switch VAR_RESULT @@ -72,14 +72,14 @@ FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 - msgbox FallarborTown_BattleTentLobby_Text_2C4F83, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4F83, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF73:: @ 81FFF73 FallarborTown_BattleTentLobby_EventScript_1FFF84:: @ 81FFF84 lockall - msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_1FFF27 end @@ -105,7 +105,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 special sub_81B9B80 playse SE_SAVE waitse - msgbox FallarborTown_BattleTentLobby_Text_2C501F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -135,7 +135,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 compare VAR_RESULT, 0 goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty - msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C47EB, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021 message FallarborTown_BattleTentLobby_Text_2C4843 @@ -159,7 +159,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4BC8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 2 setvar VAR_0x8005, 3 @@ -167,7 +167,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D waitstate compare VAR_RESULT, 0 goto_eq FallarborTown_BattleTentLobby_EventScript_2001C2 - msgbox FallarborTown_BattleTentLobby_Text_2C4B35, 5 + msgbox FallarborTown_BattleTentLobby_Text_2C4B35, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_2001C2 case 1, FallarborTown_BattleTentLobby_EventScript_2000E2 @@ -201,7 +201,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4DC3, MSGBOX_DEFAULT closemessage call FallarborTown_BattleTentLobby_EventScript_2001CF warp MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -210,7 +210,7 @@ FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C end FallarborTown_BattleTentLobby_EventScript_200169:: @ 8200169 - msgbox FallarborTown_BattleTentLobby_Text_2C48AC, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C48AC, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_200021 FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 @@ -219,11 +219,11 @@ FallarborTown_BattleTentLobby_EventScript_200176:: @ 8200176 case 1, FallarborTown_BattleTentLobby_EventScript_20019E FallarborTown_BattleTentLobby_EventScript_200191:: @ 8200191 - msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4BFA, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_20019E:: @ 820019E - msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C4CC0, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_2001CD FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB @@ -237,7 +237,7 @@ FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2 special LoadPlayerParty FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5 - msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C487F, MSGBOX_DEFAULT FallarborTown_BattleTentLobby_EventScript_2001CD:: @ 82001CD release @@ -280,15 +280,15 @@ FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D - msgbox FallarborTown_BattleTentLobby_Text_20045A, 2 + msgbox FallarborTown_BattleTentLobby_Text_20045A, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200216:: @ 8200216 - msgbox FallarborTown_BattleTentLobby_Text_200304, 2 + msgbox FallarborTown_BattleTentLobby_Text_200304, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F - msgbox FallarborTown_BattleTentLobby_Text_200382, 2 + msgbox FallarborTown_BattleTentLobby_Text_200382, MSGBOX_NPC end FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 @@ -296,20 +296,20 @@ FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 faceplayer checkflag FLAG_0x1CD goto_eq FallarborTown_BattleTentLobby_EventScript_200245 - msgbox FallarborTown_BattleTentLobby_Text_200501, 4 + msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CD release end FallarborTown_BattleTentLobby_EventScript_200245:: @ 8200245 - msgbox FallarborTown_BattleTentLobby_Text_200653, 4 + msgbox FallarborTown_BattleTentLobby_Text_200653, MSGBOX_DEFAULT release end FallarborTown_BattleTentLobby_EventScript_20024F:: @ 820024F lockall - msgbox FallarborTown_BattleTentLobby_Text_256DB8, 4 + msgbox FallarborTown_BattleTentLobby_Text_256DB8, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end @@ -328,27 +328,27 @@ FallarborTown_BattleTentLobby_EventScript_20025E:: @ 820025E end FallarborTown_BattleTentLobby_EventScript_2002BC:: @ 82002BC - msgbox FallarborTown_BattleTentLobby_Text_2C67CD, 4 + msgbox FallarborTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002CA:: @ 82002CA - msgbox FallarborTown_BattleTentLobby_Text_256E02, 4 + msgbox FallarborTown_BattleTentLobby_Text_256E02, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002D8:: @ 82002D8 - msgbox FallarborTown_BattleTentLobby_Text_256F43, 4 + msgbox FallarborTown_BattleTentLobby_Text_256F43, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002E6:: @ 82002E6 - msgbox FallarborTown_BattleTentLobby_Text_256FF2, 4 + msgbox FallarborTown_BattleTentLobby_Text_256FF2, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end FallarborTown_BattleTentLobby_EventScript_2002F4:: @ 82002F4 - msgbox FallarborTown_BattleTentLobby_Text_257202, 4 + msgbox FallarborTown_BattleTentLobby_Text_257202, MSGBOX_DEFAULT goto FallarborTown_BattleTentLobby_EventScript_20025E end @@ -358,9 +358,9 @@ FallarborTown_BattleTentLobby_EventScript_200302:: @ 8200302 FallarborTown_BattleTentLobby_Text_200304: @ 8200304 .string "Fufufufufu.\p" - .string "I’m going to make everyone think\n" - .string "I’m just a kid and let them play down.\p" - .string "Then, I’ll shock them and grab\n" + .string "I'm going to make everyone think\n" + .string "I'm just a kid and let them play down.\p" + .string "Then, I'll shock them and grab\n" .string "the title!$" FallarborTown_BattleTentLobby_Text_200382: @ 8200382 @@ -368,16 +368,16 @@ FallarborTown_BattleTentLobby_Text_200382: @ 8200382 .string "different events in different towns?\p" .string "My favorite is definitely the BATTLE\n" .string "TENT in FALLARBOR TOWN.\p" - .string "I think it’s fantastic how TRAINERS\n" + .string "I think it's fantastic how TRAINERS\n" .string "try to win with all their faith in\l" .string "their POKéMON.$" FallarborTown_BattleTentLobby_Text_20045A: @ 820045A .string "I heard something about some tent,\n" .string "so I came to camp out.\p" - .string "I didn’t know that tents these days\n" + .string "I didn't know that tents these days\n" .string "are so luxurious!\p" - .string "Since I’m here, I may as well try\n" + .string "Since I'm here, I may as well try\n" .string "my hand at battling!$" FallarborTown_BattleTentLobby_Text_200501: @ 8200501 @@ -385,13 +385,13 @@ FallarborTown_BattleTentLobby_Text_200501: @ 8200501 .string "So you came out to this BATTLE TENT!\p" .string "The people in these parts tend to be\n" .string "easygoing and laid-back.\p" - .string "But, you see, what I’m looking for are\n" + .string "But, you see, what I'm looking for are\n" .string "people with…\p" .string "How should I say this?\p" .string "Someone bursting with the desire\n" .string "and the drive to win.\p" .string "If there were a TRAINER like that,\n" - .string "I’d immediately…\p" + .string "I'd immediately…\p" .string "Whoops! Never mind!\n" .string "Keep working at it!$" diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 4c02160f7..470d80267 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -9,7 +9,7 @@ FallarborTown_House1_EventScript_200F13:: @ 8200F13 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 goto_eq FallarborTown_House1_EventScript_200F38 - msgbox FallarborTown_House1_Text_200FEE, 4 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT release end @@ -20,34 +20,34 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 call_if 1, FallarborTown_House1_EventScript_200F9C compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_200FA5 - msgbox FallarborTown_House1_Text_201159, 4 + msgbox FallarborTown_House1_Text_201159, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 setflag FLAG_0x0E5 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200F8B:: @ 8200F8B - msgbox FallarborTown_House1_Text_200FEE, 4 - msgbox FallarborTown_House1_Text_2010A2, 5 + msgbox FallarborTown_House1_Text_200FEE, MSGBOX_DEFAULT + msgbox FallarborTown_House1_Text_2010A2, MSGBOX_YESNO return FallarborTown_House1_EventScript_200F9C:: @ 8200F9C - msgbox FallarborTown_House1_Text_201249, 5 + msgbox FallarborTown_House1_Text_201249, MSGBOX_YESNO return FallarborTown_House1_EventScript_200FA5:: @ 8200FA5 setflag FLAG_TEMP_2 - msgbox FallarborTown_House1_Text_201212, 4 + msgbox FallarborTown_House1_Text_201212, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 - msgbox FallarborTown_House1_Text_2011A5, 4 + msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end @@ -58,17 +58,17 @@ FallarborTown_House1_EventScript_200FBC:: @ 8200FBC goto_eq FallarborTown_House1_EventScript_200FE4 checkflag FLAG_0x08B goto_eq FallarborTown_House1_EventScript_200FDA - msgbox FallarborTown_House1_Text_2012BC, 4 + msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FDA:: @ 8200FDA - msgbox FallarborTown_House1_Text_201310, 4 + msgbox FallarborTown_House1_Text_201310, MSGBOX_DEFAULT release end FallarborTown_House1_EventScript_200FE4:: @ 8200FE4 - msgbox FallarborTown_House1_Text_20134B, 4 + msgbox FallarborTown_House1_Text_20134B, MSGBOX_DEFAULT release end @@ -78,7 +78,7 @@ FallarborTown_House1_Text_200FEE: @ 8200FEE .string "conned into telling TEAM MAGMA where\l" .string "you can find METEORITES…\p" .string "That METEORITE from METEOR FALLS…\n" - .string "It’s never going to be mine now…$" + .string "It's never going to be mine now…$" FallarborTown_House1_Text_2010A2: @ 82010A2 .string "Oh!\n" @@ -88,7 +88,7 @@ FallarborTown_House1_Text_2010A2: @ 82010A2 .string "Is it the METEORITE that TEAM MAGMA\n" .string "took from METEOR FALLS?\p" .string "Please, may I have it?\p" - .string "I’m not asking for it for free.\n" + .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" FallarborTown_House1_Text_201159: @ 8201159 @@ -97,18 +97,18 @@ FallarborTown_House1_Text_201159: @ 8201159 .string "Please use it!$" FallarborTown_House1_Text_2011A5: @ 82011A5 - .string "PROF. COZMO: Oh, I can’t believe it.\n" + .string "PROF. COZMO: Oh, I can't believe it.\n" .string "This is really, really great!\p" .string "This is really going to help my research!$" FallarborTown_House1_Text_201212: @ 8201212 .string "PROF. COZMO: Oh, but…\n" - .string "I’m crushed with disappointment…$" + .string "I'm crushed with disappointment…$" FallarborTown_House1_Text_201249: @ 8201249 .string "PROF. COZMO: Please, may I have that\n" .string "METEORITE?\p" - .string "I’m not asking for it for free.\n" + .string "I'm not asking for it for free.\n" .string "How about in exchange for this TM?$" FallarborTown_House1_Text_2012BC: @ 82012BC @@ -118,9 +118,9 @@ FallarborTown_House1_Text_2012BC: @ 82012BC FallarborTown_House1_Text_201310: @ 8201310 .string "Poor PROF. COZMO…\n" - .string "He’s so depressed… I feel sorry for him.$" + .string "He's so depressed… I feel sorry for him.$" FallarborTown_House1_Text_20134B: @ 820134B .string "Look at PROF. COZMO…\n" - .string "He’s so happy! I think it’s cute.$" + .string "He's so happy! I think it's cute.$" diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index c24c7b1f6..2fddd2fd4 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -7,7 +7,7 @@ FallarborTown_House2_EventScript_201383:: @ 8201383 waitmovement 0 checkflag FLAG_TEMP_1 goto_eq FallarborTown_House2_EventScript_2013A8 - msgbox FallarborTown_House2_Text_20145C, 4 + msgbox FallarborTown_House2_Text_20145C, MSGBOX_DEFAULT setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_2013A8 end @@ -16,14 +16,14 @@ FallarborTown_House2_EventScript_2013A8:: @ 82013A8 checkitem ITEM_HEART_SCALE, 1 compare VAR_RESULT, 0 goto_eq FallarborTown_House2_EventScript_201452 - msgbox FallarborTown_House2_Text_201541, 5 + msgbox FallarborTown_House2_Text_201541, MSGBOX_YESNO switch VAR_RESULT case 0, FallarborTown_House2_EventScript_201452 goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_2013D6:: @ 82013D6 - msgbox FallarborTown_House2_Text_2015A5, 4 + msgbox FallarborTown_House2_Text_2015A5, MSGBOX_DEFAULT special sub_81B951C waitstate compare VAR_0x8004, 255 @@ -37,43 +37,43 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6 end FallarborTown_House2_EventScript_20140C:: @ 820140C - msgbox FallarborTown_House2_Text_2015C3, 4 + msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT special TeachMoveTutorMove waitstate compare VAR_0x8004, 0 goto_eq FallarborTown_House2_EventScript_2013D6 - msgbox FallarborTown_House2_Text_201627, 4 + msgbox FallarborTown_House2_Text_201627, MSGBOX_DEFAULT takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_201452 end FallarborTown_House2_EventScript_201436:: @ 8201436 - msgbox FallarborTown_House2_Text_2015DE, 4 + msgbox FallarborTown_House2_Text_2015DE, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201444:: @ 8201444 - msgbox FallarborTown_House2_Text_201697, 4 + msgbox FallarborTown_House2_Text_201697, MSGBOX_DEFAULT goto FallarborTown_House2_EventScript_2013D6 end FallarborTown_House2_EventScript_201452:: @ 8201452 - msgbox FallarborTown_House2_Text_201653, 4 + msgbox FallarborTown_House2_Text_201653, MSGBOX_DEFAULT releaseall end FallarborTown_House2_Text_20145C: @ 820145C - .string "I’m the MOVE TUTOR.\p" + .string "I'm the MOVE TUTOR.\p" .string "I know all the moves that POKéMON\n" .string "learn--every one of them--and I can\l" .string "teach POKéMON those moves.\p" .string "I can teach a move to a POKéMON\n" - .string "of yours if you’d like.\p" - .string "I’ll do it for a HEART SCALE.\n" - .string "I’m collecting those now.$" + .string "of yours if you'd like.\p" + .string "I'll do it for a HEART SCALE.\n" + .string "I'm collecting those now.$" FallarborTown_House2_Text_201541: @ 8201541 - .string "Oh! That’s it! That’s an honest to\n" + .string "Oh! That's it! That's an honest to\n" .string "goodness HEART SCALE!\p" .string "Let me guess, you want me to teach\n" .string "a move?$" @@ -86,7 +86,7 @@ FallarborTown_House2_Text_2015C3: @ 82015C3 FallarborTown_House2_Text_2015DE: @ 82015DE .string "Sorry…\p" - .string "It doesn’t appear as if I have any move\n" + .string "It doesn't appear as if I have any move\n" .string "I can teach that POKéMON.$" FallarborTown_House2_Text_201627: @ 8201627 @@ -98,6 +98,6 @@ FallarborTown_House2_Text_201653: @ 8201653 .string "come back with a HEART SCALE.$" FallarborTown_House2_Text_201697: @ 8201697 - .string "Hunh? There isn’t a single move that\n" + .string "Hunh? There isn't a single move that\n" .string "I can teach an EGG.$" diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index dbaf33f4e..bd9de930c 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -7,7 +7,7 @@ FallarborTown_Mart_EventScript_1FFCBF:: @ 81FFCBF message gUnknown_08272A21 waitmessage pokemart FallarborTown_Mart_Pokemart_1FFCD8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ FallarborTown_Mart_Pokemart_1FFCD8: @ 81FFCD8 end FallarborTown_Mart_EventScript_1FFCF4:: @ 81FFCF4 - msgbox FallarborTown_Mart_Text_1FFD19, 2 + msgbox FallarborTown_Mart_Text_1FFD19, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFCFD:: @ 81FFCFD - msgbox FallarborTown_Mart_Text_1FFE09, 2 + msgbox FallarborTown_Mart_Text_1FFE09, MSGBOX_NPC end FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 @@ -42,16 +42,16 @@ FallarborTown_Mart_EventScript_1FFD06:: @ 81FFD06 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox FallarborTown_Mart_Text_1FFDFA, 4 + msgbox FallarborTown_Mart_Text_1FFDFA, MSGBOX_DEFAULT waitmoncry release end FallarborTown_Mart_Text_1FFD19: @ 81FFD19 - .string "I’m having a hard time deciding if I\n" + .string "I'm having a hard time deciding if I\n" .string "should make my SKITTY evolve or not.\p" .string "I only have to use this MOON STONE,\n" - .string "but it’s so hard to decide…\p" + .string "but it's so hard to decide…\p" .string "If I make it evolve, it will become\n" .string "much stronger.\p" .string "But it will look so different, too.$" @@ -61,6 +61,6 @@ FallarborTown_Mart_Text_1FFDFA: @ 81FFDFA FallarborTown_Mart_Text_1FFE09: @ 81FFE09 .string "This NUGGET I found here…\n" - .string "I suppose I’ll have to sell it, seeing\l" + .string "I suppose I'll have to sell it, seeing\l" .string "as how it has no other use.$" diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index e408f04d9..c9a7ef27c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ FallarborTown_PokemonCenter_1F_EventScript_200BE1:: @ 8200BE1 end FallarborTown_PokemonCenter_1F_EventScript_200BEF:: @ 8200BEF - msgbox FallarborTown_PokemonCenter_1F_Text_200E22, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E22, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200BF8:: @ 8200BF8 - msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, 2 + msgbox FallarborTown_PokemonCenter_1F_Text_200E8B, MSGBOX_NPC end FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01 lock faceplayer - msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, 4 + msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 @@ -84,17 +84,17 @@ FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B .string "Oh, hello.\n" .string "You are?\p" - .string "Okay, your name’s {PLAYER}{KUN}.\n" - .string "I can see that you’re a TRAINER.\p" + .string "Okay, your name's {PLAYER}{KUN}.\n" + .string "I can see that you're a TRAINER.\p" .string "So that means you use the POKéMON\n" .string "Storage System I developed.\p" .string "How I arrived at that conclusion is\n" .string "a simple deductive process.\p" .string "You spoke to me because you wanted\n" .string "to access something on this PC.\p" - .string "Oh, I’m sorry. I’m LANETTE.\p" - .string "Honestly, I’m glad to meet you--it’s\n" - .string "great you’re using the Storage System.\p" + .string "Oh, I'm sorry. I'm LANETTE.\p" + .string "Honestly, I'm glad to meet you--it's\n" + .string "great you're using the Storage System.\p" .string "If you could, please visit me at home.\n" .string "My house is on ROUTE 114.$" diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 08331b33b..1fd5fdd35 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -19,10 +19,10 @@ FarawayIsland_Entrance_EventScript_267C9D:: @ 8267C9D FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 lock faceplayer - msgbox FarawayIsland_Entrance_Text_2C6B42, 5 + msgbox FarawayIsland_Entrance_Text_2C6B42, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FarawayIsland_Entrance_EventScript_267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A5D, 4 + msgbox FarawayIsland_Entrance_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FarawayIsland_Entrance_Movement_2725AA waitmovement 0 @@ -36,11 +36,11 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2 end FarawayIsland_Entrance_EventScript_267CE7:: @ 8267CE7 - msgbox FarawayIsland_Entrance_Text_2A6A82, 4 + msgbox FarawayIsland_Entrance_Text_2A6A82, MSGBOX_DEFAULT release end FarawayIsland_Entrance_EventScript_267CF1:: @ 8267CF1 - msgbox FarawayIsland_Entrance_Text_2C6D5A, 3 + msgbox FarawayIsland_Entrance_Text_2C6D5A, MSGBOX_SIGN end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index a2892988a..7b62ab578 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -198,7 +198,7 @@ FarawayIsland_Interior_EventScript_267EDB:: @ 8267EDB setflag FLAG_HIDE_MEW removeobject 1 fadescreenswapbuffers 0 - msgbox FarawayIsland_Interior_Text_267EF1, 4 + msgbox FarawayIsland_Interior_Text_267EF1, MSGBOX_DEFAULT closemessage releaseall end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 4a28a180b..948f443d2 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -12,7 +12,7 @@ FortreeCity_MapScript1_1E25B3: @ 81E25B3 end FortreeCity_EventScript_1E25B6:: @ 81E25B6 - msgbox FortreeCity_Text_1E2676, 2 + msgbox FortreeCity_Text_1E2676, MSGBOX_NPC end FortreeCity_EventScript_1E25BF:: @ 81E25BF @@ -20,37 +20,37 @@ FortreeCity_EventScript_1E25BF:: @ 81E25BF faceplayer checkflag FLAG_0x127 goto_eq FortreeCity_EventScript_1E25D4 - msgbox FortreeCity_Text_1E2738, 4 + msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25D4:: @ 81E25D4 - msgbox FortreeCity_Text_1E27B6, 4 + msgbox FortreeCity_Text_1E27B6, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E25DE:: @ 81E25DE - msgbox FortreeCity_Text_1E27FE, 2 + msgbox FortreeCity_Text_1E27FE, MSGBOX_NPC end FortreeCity_EventScript_1E25E7:: @ 81E25E7 - msgbox FortreeCity_Text_1E2880, 2 + msgbox FortreeCity_Text_1E2880, MSGBOX_NPC end FortreeCity_EventScript_1E25F0:: @ 81E25F0 - msgbox FortreeCity_Text_1E292E, 2 + msgbox FortreeCity_Text_1E292E, MSGBOX_NPC end FortreeCity_EventScript_1E25F9:: @ 81E25F9 - msgbox FortreeCity_Text_1E299D, 2 + msgbox FortreeCity_Text_1E299D, MSGBOX_NPC end FortreeCity_EventScript_1E2602:: @ 81E2602 - msgbox FortreeCity_Text_1E2AAC, 3 + msgbox FortreeCity_Text_1E2AAC, MSGBOX_SIGN end FortreeCity_EventScript_1E260B:: @ 81E260B - msgbox FortreeCity_Text_1E2AE6, 3 + msgbox FortreeCity_Text_1E2AE6, MSGBOX_SIGN end FortreeCity_EventScript_1E2614:: @ 81E2614 @@ -59,19 +59,19 @@ FortreeCity_EventScript_1E2614:: @ 81E2614 checkitem ITEM_DEVON_SCOPE, 1 compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2630 - msgbox FortreeCity_Text_1E29E5, 4 + msgbox FortreeCity_Text_1E29E5, MSGBOX_DEFAULT release end FortreeCity_EventScript_1E2630:: @ 81E2630 - msgbox FortreeCity_Text_1E2A08, 5 + msgbox FortreeCity_Text_1E2A08, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq FortreeCity_EventScript_1E2645 release end FortreeCity_EventScript_1E2645:: @ 81E2645 - msgbox FortreeCity_Text_1E2A48, 4 + msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 waitmovement 0 @@ -101,26 +101,26 @@ FortreeCity_Text_1E2676: @ 81E2676 FortreeCity_Text_1E2738: @ 81E2738 .string "I want to go to the POKéMON GYM,\n" - .string "but something’s blocking the way.\p" + .string "but something's blocking the way.\p" .string "After all the bother I went through\n" .string "training on ROUTE 120…$" FortreeCity_Text_1E27B6: @ 81E27B6 - .string "I’ve got my pride-and-joy POKéMON\n" - .string "with me. This time, I’ll beat WINONA.$" + .string "I've got my pride-and-joy POKéMON\n" + .string "with me. This time, I'll beat WINONA.$" FortreeCity_Text_1E27FE: @ 81E27FE .string "The ground absorbs rainwater, and\n" .string "trees grow by drinking that water…\p" .string "Our FORTREE CITY exists because\n" - .string "there’s both water and soil.$" + .string "there's both water and soil.$" FortreeCity_Text_1E2880: @ 81E2880 .string "The CITY consists of homes built on\n" .string "trees.\p" .string "Perhaps because of that lifestyle,\n" .string "everyone is healthy and lively.\p" - .string "Why, even myself--I feel as if I’ve\n" + .string "Why, even myself--I feel as if I've\n" .string "grown thirty years younger.$" FortreeCity_Text_1E292E: @ 81E292E @@ -131,7 +131,7 @@ FortreeCity_Text_1E292E: @ 81E292E FortreeCity_Text_1E299D: @ 81E299D .string "There are POKéMON that evolve when\n" - .string "you trade them! That’s what I heard.$" + .string "you trade them! That's what I heard.$" FortreeCity_Text_1E29E5: @ 81E29E5 .string "Something unseeable is in the way.$" diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 2229ab702..5274daeda 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_DecorationShop_MapScripts:: @ 821800D .byte 0 FortreeCity_DecorationShop_EventScript_21800E:: @ 821800E - msgbox FortreeCity_DecorationShop_Text_218078, 2 + msgbox FortreeCity_DecorationShop_Text_218078, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218017:: @ 8218017 - msgbox FortreeCity_DecorationShop_Text_2180ED, 2 + msgbox FortreeCity_DecorationShop_Text_2180ED, MSGBOX_NPC end FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 @@ -15,7 +15,7 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C message gUnknown_08272A21 waitmessage pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -60,13 +60,13 @@ FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064 FortreeCity_DecorationShop_Text_218078: @ 8218078 .string "Merchandise you buy here is sent to\n" .string "your own PC.\p" - .string "That’s fantastic! I wish they could\n" + .string "That's fantastic! I wish they could\n" .string "also deliver me home like that.$" FortreeCity_DecorationShop_Text_2180ED: @ 82180ED - .string "I’m buying a pretty desk and I’m\n" + .string "I'm buying a pretty desk and I'm\n" .string "putting my cute DOLLS on it.\p" - .string "If I don’t, when I decorate my\n" + .string "If I don't, when I decorate my\n" .string "SECRET BASE, my DOLLS will get\l" .string "dirty or poked with splinters.$" diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 1b1100cf3..c56f0cbdb 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,13 +16,13 @@ FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 - trainerbattle 1, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD + trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_216D75, FortreeCity_Gym_Text_216E60, FortreeCity_Gym_EventScript_2165FD, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq FortreeCity_Gym_EventScript_21668D checkflag FLAG_0x0AA goto_if 0, FortreeCity_Gym_EventScript_216646 - msgbox FortreeCity_Gym_Text_217071, 4 + msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD message FortreeCity_Gym_Text_216EEC waitmessage call FortreeCity_Gym_EventScript_27207E - msgbox FortreeCity_Gym_Text_216F17, 4 + msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT setflag FLAG_0x4F5 setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 @@ -39,7 +39,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox FortreeCity_Gym_Text_217044, 4 + msgbox FortreeCity_Gym_Text_217044, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_272054 - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA release end @@ -62,43 +62,43 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A giveitem_std ITEM_TM40 compare VAR_RESULT, 0 goto_eq FortreeCity_Gym_EventScript_27205E - msgbox FortreeCity_Gym_Text_216FEC, 4 + msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT setflag FLAG_0x0AA return FortreeCity_Gym_EventScript_21668D:: @ 821668D - trainerbattle 7, TRAINER_WINONA_1, 0, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 - msgbox FortreeCity_Gym_Text_21720B, 6 + trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_217100, FortreeCity_Gym_Text_2171E6, FortreeCity_Gym_Text_217292 + msgbox FortreeCity_Gym_Text_21720B, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166A8:: @ 82166A8 - trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 - msgbox FortreeCity_Gym_Text_2168E7, 6 + trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_2168A2, FortreeCity_Gym_Text_2168D3 + msgbox FortreeCity_Gym_Text_2168E7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166BF:: @ 82166BF - trainerbattle 0, TRAINER_EDWARDO, 0, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 - msgbox FortreeCity_Gym_Text_2169F1, 6 + trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_21695A, FortreeCity_Gym_Text_2169C7 + msgbox FortreeCity_Gym_Text_2169F1, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166D6:: @ 82166D6 - trainerbattle 0, TRAINER_FLINT, 0, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 - msgbox FortreeCity_Gym_Text_216AD7, 6 + trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_216A66, FortreeCity_Gym_Text_216AC4 + msgbox FortreeCity_Gym_Text_216AD7, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_2166ED:: @ 82166ED - trainerbattle 0, TRAINER_ASHLEY, 0, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 - msgbox FortreeCity_Gym_Text_216B5F, 6 + trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_216B1A, FortreeCity_Gym_Text_216B51 + msgbox FortreeCity_Gym_Text_216B5F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216704:: @ 8216704 - trainerbattle 0, TRAINER_HUMBERTO, 0, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 - msgbox FortreeCity_Gym_Text_216C32, 6 + trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_216B9E, FortreeCity_Gym_Text_216C18 + msgbox FortreeCity_Gym_Text_216C32, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_21671B:: @ 821671B - trainerbattle 0, TRAINER_DARIUS, 0, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 - msgbox FortreeCity_Gym_Text_216D0F, 6 + trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_216C96, FortreeCity_Gym_Text_216CF2 + msgbox FortreeCity_Gym_Text_216D0F, MSGBOX_AUTOCLOSE end FortreeCity_Gym_EventScript_216732:: @ 8216732 @@ -106,12 +106,12 @@ FortreeCity_Gym_EventScript_216732:: @ 8216732 faceplayer checkflag FLAG_0x4F5 goto_eq FortreeCity_Gym_EventScript_216747 - msgbox FortreeCity_Gym_Text_216785, 4 + msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end FortreeCity_Gym_EventScript_216747:: @ 8216747 - msgbox FortreeCity_Gym_Text_21687D, 4 + msgbox FortreeCity_Gym_Text_21687D, MSGBOX_DEFAULT release end @@ -130,29 +130,29 @@ FortreeCity_Gym_EventScript_216761:: @ 8216761 end FortreeCity_Gym_EventScript_216771:: @ 8216771 - msgbox FortreeCity_Gym_Text_2170C7, 4 + msgbox FortreeCity_Gym_Text_2170C7, MSGBOX_DEFAULT releaseall end FortreeCity_Gym_EventScript_21677B:: @ 821677B - msgbox FortreeCity_Gym_Text_2170AE, 4 + msgbox FortreeCity_Gym_Text_2170AE, MSGBOX_DEFAULT releaseall end FortreeCity_Gym_Text_216785: @ 8216785 - .string "Yo, how’s it going, CHAMPION-\n" + .string "Yo, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "FORTREE GYM LEADER WINONA is\n" .string "a master of FLYING-type POKéMON.\p" - .string "She’s waiting at the back of this GYM,\n" + .string "She's waiting at the back of this GYM,\n" .string "behind the rotating doors.\p" - .string "She’s waiting for new challengers\n" + .string "She's waiting for new challengers\n" .string "who are trying to take wing!\p" .string "Okay, go for it!$" FortreeCity_Gym_Text_21687D: @ 821687D .string "You did it!\n" - .string "You’ve achieved liftoff!$" + .string "You've achieved liftoff!$" FortreeCity_Gym_Text_2168A2: @ 82168A2 .string "Behold the elegant battle style of\n" @@ -160,7 +160,7 @@ FortreeCity_Gym_Text_2168A2: @ 82168A2 FortreeCity_Gym_Text_2168D3: @ 82168D3 .string "You…\n" - .string "You’re strong…$" + .string "You're strong…$" FortreeCity_Gym_Text_2168E7: @ 82168E7 .string "A TRAINER has to be smart to keep\n" @@ -172,7 +172,7 @@ FortreeCity_Gym_Text_21695A: @ 821695A .string "The lovers of BIRD POKéMON aspire\n" .string "to join this GYM.\p" .string "As a member of the FORTREE GYM,\n" - .string "I’m not allowed to lose!$" + .string "I'm not allowed to lose!$" FortreeCity_Gym_Text_2169C7: @ 82169C7 .string "It was too much of a load for me\n" @@ -181,26 +181,26 @@ FortreeCity_Gym_Text_2169C7: @ 82169C7 FortreeCity_Gym_Text_2169F1: @ 82169F1 .string "The world is huge, and there are\n" .string "countless tough TRAINERS.\p" - .string "I’m going to keep training and make\n" + .string "I'm going to keep training and make\n" .string "myself even stronger.$" FortreeCity_Gym_Text_216A66: @ 8216A66 - .string "There’s no need for WINONA, our GYM\n" + .string "There's no need for WINONA, our GYM\n" .string "LEADER, to deal with you!\p" - .string "I’m plenty good enough for you!$" + .string "I'm plenty good enough for you!$" FortreeCity_Gym_Text_216AC4: @ 8216AC4 .string "WINONA, I…\n" .string "I lost!$" FortreeCity_Gym_Text_216AD7: @ 8216AD7 - .string "WINONA is cute and she’s strong.\n" - .string "She’s the ultimate LEADER!\p" + .string "WINONA is cute and she's strong.\n" + .string "She's the ultimate LEADER!\p" .string "Blush…$" FortreeCity_Gym_Text_216B1A: @ 8216B1A .string "WINONA taught me personally!\n" - .string "You can’t beat me easily!$" + .string "You can't beat me easily!$" FortreeCity_Gym_Text_216B51: @ 8216B51 .string "I was beaten…$" @@ -212,20 +212,20 @@ FortreeCity_Gym_Text_216B5F: @ 8216B5F FortreeCity_Gym_Text_216B9E: @ 8216B9E .string "When WINONA takes to battle, her face\n" .string "shines with beautiful determination…\p" - .string "I’m not letting you witness that\n" + .string "I'm not letting you witness that\n" .string "lovely sight!$" FortreeCity_Gym_Text_216C18: @ 8216C18 .string "Urk!\n" - .string "I couldn’t stop you.$" + .string "I couldn't stop you.$" FortreeCity_Gym_Text_216C32: @ 8216C32 - .string "You’d better watch it!\n" - .string "Don’t get distracted staring at WINONA\l" - .string "or you’ll go crashing down in a heap!$" + .string "You'd better watch it!\n" + .string "Don't get distracted staring at WINONA\l" + .string "or you'll go crashing down in a heap!$" FortreeCity_Gym_Text_216C96: @ 8216C96 - .string "You’d better know that there are all\n" + .string "You'd better know that there are all\n" .string "sorts of FLYING-type POKéMON.\p" .string "You do know that, right?$" @@ -234,8 +234,8 @@ FortreeCity_Gym_Text_216CF2: @ 8216CF2 FortreeCity_Gym_Text_216D0F: @ 8216D0F .string "Sure, you beat me all right.\n" - .string "But you’d better watch it! Our LEADER\l" - .string "WINONA’s POKéMON are all business.$" + .string "But you'd better watch it! Our LEADER\l" + .string "WINONA's POKéMON are all business.$" FortreeCity_Gym_Text_216D75: @ 8216D75 .string "I am WINONA. I am the LEADER of\n" @@ -286,12 +286,12 @@ FortreeCity_Gym_Text_2170AE: @ 82170AE FortreeCity_Gym_Text_2170C7: @ 82170C7 .string "FORTREE CITY POKéMON GYM\p" - .string "WINONA’S CERTIFIED TRAINERS:\n" + .string "WINONA'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" FortreeCity_Gym_Text_217100: @ 8217100 .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" + .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" .string "we have the power to soar!\p" .string "You have scaled the pinnacle as\n" @@ -311,7 +311,7 @@ FortreeCity_Gym_Text_21720B: @ 821720B FortreeCity_Gym_Text_217292: @ 8217292 .string "WINONA: We humans can never escape\n" - .string "gravity’s pull on the ground.\p" + .string "gravity's pull on the ground.\p" .string "But by striving for excellence,\n" .string "we have the power to soar!\p" .string "You have scaled the pinnacle as\n" diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 7e45bf87a..52a9793c3 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -10,7 +10,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox FortreeCity_House1_Text_21637B, 5 + msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq FortreeCity_House1_EventScript_21633D special sub_81B94B0 @@ -29,29 +29,29 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216440, 4 + msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT setflag FLAG_0x09B release end FortreeCity_House1_EventScript_21633D:: @ 821633D - msgbox FortreeCity_House1_Text_21649F, 4 + msgbox FortreeCity_House1_Text_21649F, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216347:: @ 8216347 bufferspeciesname 0, VAR_0x8009 - msgbox FortreeCity_House1_Text_216474, 4 + msgbox FortreeCity_House1_Text_216474, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_216355:: @ 8216355 - msgbox FortreeCity_House1_Text_2164DB, 4 + msgbox FortreeCity_House1_Text_2164DB, MSGBOX_DEFAULT release end FortreeCity_House1_EventScript_21635F:: @ 821635F - msgbox FortreeCity_House1_Text_21653B, 2 + msgbox FortreeCity_House1_Text_21653B, MSGBOX_NPC end FortreeCity_House1_EventScript_216368:: @ 8216368 @@ -59,7 +59,7 @@ FortreeCity_House1_EventScript_216368:: @ 8216368 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House1_Text_216597, 4 + msgbox FortreeCity_House1_Text_216597, MSGBOX_DEFAULT waitmoncry release end @@ -67,12 +67,12 @@ FortreeCity_House1_EventScript_216368:: @ 8216368 FortreeCity_House1_Text_21637B: @ 821637B .string "Wrooooaaar! I need it!\n" .string "I have to get me a {STR_VAR_1}!\l" - .string "I’ll do anything for it!\p" + .string "I'll do anything for it!\p" .string "…Uh… Did you hear that?\n" .string "My shout from the bottom of my heart?\p" .string "Having heard that, you will trade\n" .string "your {STR_VAR_1} for my {STR_VAR_2},\l" - .string "won’t you?$" + .string "won't you?$" FortreeCity_House1_Text_216440: @ 8216440 .string "Oh, yeah, right on!\p" @@ -80,21 +80,21 @@ FortreeCity_House1_Text_216440: @ 8216440 .string "{STR_VAR_2}, you take care!$" FortreeCity_House1_Text_216474: @ 8216474 - .string "Uh, no, I don’t think so.\n" - .string "That isn’t a {STR_VAR_1}.$" + .string "Uh, no, I don't think so.\n" + .string "That isn't a {STR_VAR_1}.$" FortreeCity_House1_Text_21649F: @ 821649F - .string "No? You won’t trade me?\n" + .string "No? You won't trade me?\n" .string "Even after I bared my heart to you?$" FortreeCity_House1_Text_2164DB: @ 82164DB - .string "I’m going to make VOLBEAT super\n" + .string "I'm going to make VOLBEAT super\n" .string "strong from this moment on!\p" .string "I hope you do the same with PLUSLE!$" FortreeCity_House1_Text_21653B: @ 821653B .string "Trading POKéMON with others…\p" - .string "It’s as if you’re trading your own\n" + .string "It's as if you're trading your own\n" .string "memories with other people.$" FortreeCity_House1_Text_216597: @ 8216597 diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 8f75b20d9..0a5042c09 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -8,39 +8,39 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB goto_eq FortreeCity_House2_EventScript_21786E checkflag FLAG_0x076 call_if 0, FortreeCity_House2_EventScript_217862 - msgbox FortreeCity_House2_Text_2178D6, 4 + msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_21796A, 4 + msgbox FortreeCity_House2_Text_21796A, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 1, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_2179C9, 4 + msgbox FortreeCity_House2_Text_2179C9, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT case 0, FortreeCity_House2_EventScript_217878 - msgbox FortreeCity_House2_Text_217A28, 4 + msgbox FortreeCity_House2_Text_217A28, MSGBOX_DEFAULT giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_eq FortreeCity_House2_EventScript_272054 setflag FLAG_0x108 - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217862:: @ 8217862 - msgbox FortreeCity_House2_Text_217882, 4 + msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT setflag FLAG_0x076 return FortreeCity_House2_EventScript_21786E:: @ 821786E - msgbox FortreeCity_House2_Text_217A91, 4 + msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217878:: @ 8217878 - msgbox FortreeCity_House2_Text_217AC7, 4 + msgbox FortreeCity_House2_Text_217AC7, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc index 92b963811..fe1f6cfee 100644 --- a/data/maps/FortreeCity_House3/scripts.inc +++ b/data/maps/FortreeCity_House3/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House3_MapScripts:: @ 8217AE7 .byte 0 FortreeCity_House3_EventScript_217AE8:: @ 8217AE8 - msgbox FortreeCity_House3_Text_217AFA, 2 + msgbox FortreeCity_House3_Text_217AFA, MSGBOX_NPC end FortreeCity_House3_EventScript_217AF1:: @ 8217AF1 - msgbox FortreeCity_House3_Text_217C22, 2 + msgbox FortreeCity_House3_Text_217C22, MSGBOX_NPC end FortreeCity_House3_Text_217AFA: @ 8217AFA @@ -16,14 +16,14 @@ FortreeCity_House3_Text_217AFA: @ 8217AFA .string "I was searching for rare stones.\p" .string "Hoo, boy, he had some amazing POKéMON\n" .string "with him.\p" - .string "They weren’t just rare, they were\n" + .string "They weren't just rare, they were\n" .string "trained to terrifying extremes!\p" .string "He might even be stronger than the\n" .string "GYM LEADER in this town…$" FortreeCity_House3_Text_217C22: @ 8217C22 - .string "What’s that thing you have there?\p" + .string "What's that thing you have there?\p" .string "… … … … … …\p" - .string "Oh, it’s called a POKéDEX?\n" - .string "It’s really awesome!$" + .string "Oh, it's called a POKéDEX?\n" + .string "It's really awesome!$" diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index bf71282bf..eb6043ab3 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -2,7 +2,7 @@ FortreeCity_House4_MapScripts:: @ 8217C80 .byte 0 FortreeCity_House4_EventScript_217C81:: @ 8217C81 - msgbox FortreeCity_House4_Text_217D33, 2 + msgbox FortreeCity_House4_Text_217D33, MSGBOX_NPC end FortreeCity_House4_EventScript_217C8A:: @ 8217C8A @@ -13,7 +13,7 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A goto_eq FortreeCity_House4_EventScript_217CD8 checkflag FLAG_0x0DE goto_eq FortreeCity_House4_EventScript_217CC4 - msgbox FortreeCity_House4_Text_217DB9, 4 + msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage setflag FLAG_0x0DE clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL @@ -26,14 +26,14 @@ FortreeCity_House4_EventScript_217C8A:: @ 8217C8A FortreeCity_House4_EventScript_217CC4:: @ 8217CC4 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217DD2, 4 + msgbox FortreeCity_House4_Text_217DD2, MSGBOX_DEFAULT releaseall end FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217E05, 4 + msgbox FortreeCity_House4_Text_217E05, MSGBOX_DEFAULT giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_eq FortreeCity_House4_EventScript_272054 @@ -44,7 +44,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 FortreeCity_House4_EventScript_217D06:: @ 8217D06 applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_27259E waitmovement 0 - msgbox FortreeCity_House4_Text_217EA8, 4 + msgbox FortreeCity_House4_Text_217EA8, MSGBOX_DEFAULT releaseall end @@ -61,7 +61,7 @@ FortreeCity_House4_EventScript_217D20:: @ 8217D20 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox FortreeCity_House4_Text_217EE0, 4 + msgbox FortreeCity_House4_Text_217EE0, MSGBOX_DEFAULT waitmoncry release end @@ -70,7 +70,7 @@ FortreeCity_House4_Text_217D33: @ 8217D33 .string "By being together with POKéMON,\n" .string "people make more and more friends.\p" .string "And that brings the world closer\n" - .string "together. I think it’s wonderful!$" + .string "together. I think it's wonderful!$" FortreeCity_House4_Text_217DB9: @ 8217DB9 .string "There!\n" @@ -87,7 +87,7 @@ FortreeCity_House4_Text_217E05: @ 8217E05 .string "What is it holding?\p" .string "A MENTAL HERB?\n" .string "It must have picked it up somewhere.\p" - .string "But I’m not a TRAINER, so you can\n" + .string "But I'm not a TRAINER, so you can\n" .string "have it.$" FortreeCity_House4_Text_217EA8: @ 8217EA8 diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc index d4f1f2b02..a40fe0e83 100644 --- a/data/maps/FortreeCity_House5/scripts.inc +++ b/data/maps/FortreeCity_House5/scripts.inc @@ -2,11 +2,11 @@ FortreeCity_House5_MapScripts:: @ 8217EF1 .byte 0 FortreeCity_House5_EventScript_217EF2:: @ 8217EF2 - msgbox FortreeCity_House5_Text_217F17, 2 + msgbox FortreeCity_House5_Text_217F17, MSGBOX_NPC end FortreeCity_House5_EventScript_217EFB:: @ 8217EFB - msgbox FortreeCity_House5_Text_217F80, 2 + msgbox FortreeCity_House5_Text_217F80, MSGBOX_NPC end FortreeCity_House5_EventScript_217F04:: @ 8217F04 @@ -14,20 +14,20 @@ FortreeCity_House5_EventScript_217F04:: @ 8217F04 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox FortreeCity_House5_Text_217FFB, 4 + msgbox FortreeCity_House5_Text_217FFB, MSGBOX_DEFAULT waitmoncry release end FortreeCity_House5_Text_217F17: @ 8217F17 .string "The tree houses of FORTREE are great!\p" - .string "I think it’s the number one town for\n" + .string "I think it's the number one town for\n" .string "living together with POKéMON.$" FortreeCity_House5_Text_217F80: @ 8217F80 .string "POKéMON and people have adapted to\n" .string "nature for survival.\p" - .string "There’s no need to make nature\n" + .string "There's no need to make nature\n" .string "conform to the way we want to live.$" FortreeCity_House5_Text_217FFB: @ 8217FFB diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index 050fc8f4c..8d2f9b568 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -7,7 +7,7 @@ FortreeCity_Mart_EventScript_217666:: @ 8217666 message gUnknown_08272A21 waitmessage pokemart FortreeCity_Mart_Pokemart_217680 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,26 +28,26 @@ FortreeCity_Mart_Pokemart_217680: @ 8217680 end FortreeCity_Mart_EventScript_217698:: @ 8217698 - msgbox FortreeCity_Mart_Text_2176B3, 2 + msgbox FortreeCity_Mart_Text_2176B3, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176A1:: @ 82176A1 - msgbox FortreeCity_Mart_Text_217715, 2 + msgbox FortreeCity_Mart_Text_217715, MSGBOX_NPC end FortreeCity_Mart_EventScript_2176AA:: @ 82176AA - msgbox FortreeCity_Mart_Text_21778E, 2 + msgbox FortreeCity_Mart_Text_21778E, MSGBOX_NPC end FortreeCity_Mart_Text_2176B3: @ 82176B3 .string "SUPER REPEL lasts a long time,\n" .string "and it gets the job done.\p" - .string "It’s much better than an ordinary\n" + .string "It's much better than an ordinary\n" .string "REPEL.$" FortreeCity_Mart_Text_217715: @ 8217715 .string "I always stock up on more items than\n" - .string "I’m sure I’ll need.\p" + .string "I'm sure I'll need.\p" .string "You never know what might happen.\n" .string "Better to be safe than sorry!$" diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 4885c7f15..339cae9eb 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -16,40 +16,40 @@ FortreeCity_PokemonCenter_1F_EventScript_2173E7:: @ 82173E7 end FortreeCity_PokemonCenter_1F_EventScript_2173F5:: @ 82173F5 - msgbox FortreeCity_PokemonCenter_1F_Text_217410, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_217410, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_2173FE:: @ 82173FE - msgbox FortreeCity_PokemonCenter_1F_Text_21746D, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21746D, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_EventScript_217407:: @ 8217407 - msgbox FortreeCity_PokemonCenter_1F_Text_21751F, 2 + msgbox FortreeCity_PokemonCenter_1F_Text_21751F, MSGBOX_NPC end FortreeCity_PokemonCenter_1F_Text_217410: @ 8217410 .string "Listen, kid, are you working\n" .string "on a POKéDEX?\p" .string "Hmm… Go to the SAFARI ZONE.\n" - .string "That’s my suggestion.$" + .string "That's my suggestion.$" FortreeCity_PokemonCenter_1F_Text_21746D: @ 821746D .string "Have you done anything at\n" .string "the RECORD CORNER?\p" - .string "It’s pretty neat. It mixes and matches\n" + .string "It's pretty neat. It mixes and matches\n" .string "the records of TRAINERS.\p" - .string "I don’t know quite how it works,\n" - .string "but it’s cool. It’s exciting, even!$" + .string "I don't know quite how it works,\n" + .string "but it's cool. It's exciting, even!$" FortreeCity_PokemonCenter_1F_Text_21751F: @ 821751F .string "Oh, wow, you have a POKéNAV!\n" - .string "And it’s just like mine!\p" - .string "Do you know about POKéNAV’s\n" + .string "And it's just like mine!\p" + .string "Do you know about POKéNAV's\n" .string "MATCH CALL system?\p" .string "Access it, and you can chat with\n" .string "registered TRAINERS anytime.\p" .string "It also shows you which TRAINERS\n" .string "want a rematch with you.\p" - .string "It’s really nifty! Those DEVON guys\n" - .string "sure know what they’re doing!$" + .string "It's really nifty! Those DEVON guys\n" + .string "sure know what they're doing!$" diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index f3d303c0f..28b95d578 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -6,29 +6,29 @@ GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E faceplayer checkflag FLAG_0x06D goto_eq GraniteCave_1F_EventScript_22DA8A - msgbox GraniteCave_1F_Text_22DA94, 4 + msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 setflag FLAG_0x06D - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A - msgbox GraniteCave_1F_Text_22DBB7, 4 + msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end GraniteCave_1F_Text_22DA94: @ 822DA94 .string "Hey, you.\n" .string "It gets awfully dark ahead.\l" - .string "It’ll be tough trying to explore.\p" + .string "It'll be tough trying to explore.\p" .string "That guy who came by earlier…\n" .string "STEVEN, I think it was.\p" .string "He knew how to use FLASH, so he ought\n" .string "to be all right, but…\p" .string "Well, for us HIKERS, helping out those\n" .string "that we meet is our motto.\p" - .string "Here you go, I’ll pass this on to you.$" + .string "Here you go, I'll pass this on to you.$" GraniteCave_1F_Text_22DBB7: @ 822DBB7 .string "Teach that hidden move FLASH to\n" @@ -36,5 +36,5 @@ GraniteCave_1F_Text_22DBB7: @ 822DBB7 .string "It lights up even the inky darkness\n" .string "of caves.\p" .string "But, to use it, you need the GYM BADGE\n" - .string "from DEWFORD’s POKéMON GYM.$" + .string "from DEWFORD's POKéMON GYM.$" diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index b057a0548..da0668bac 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -4,24 +4,24 @@ GraniteCave_StevensRoom_MapScripts:: @ 822DC7A GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B lock faceplayer - msgbox GraniteCave_StevensRoom_Text_22DD5A, 4 + msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT setvar VAR_0x8004, 274 call GraniteCave_StevensRoom_EventScript_2723E4 setflag FLAG_0x0BD - msgbox GraniteCave_StevensRoom_Text_22DDBD, 4 + msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_22DD3C - msgbox GraniteCave_StevensRoom_Text_22DE6B, 4 + msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox GraniteCave_StevensRoom_Text_22DF6A, 4 + msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x131 - msgbox GraniteCave_StevensRoom_Text_22DF8C, 4 + msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_22DD0D @@ -54,7 +54,7 @@ GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A return GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C - msgbox GraniteCave_StevensRoom_Text_22DFAA, 4 + msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 @@ -86,7 +86,7 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A .string "My name is STEVEN.\p" - .string "I’m interested in rare stones,\n" + .string "I'm interested in rare stones,\n" .string "so I travel here and there.\p" .string "Oh?\n" .string "A LETTER for me?$" @@ -96,7 +96,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD .string "You went through all this trouble to\n" .string "deliver that. I need to thank you.\p" .string "Let me see…\n" - .string "I’ll give you this TM.\p" + .string "I'll give you this TM.\p" .string "It contains my favorite move,\n" .string "STEEL WING.$" @@ -105,9 +105,9 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B .string "capable.\p" .string "If you keep training, you could even\n" .string "become the CHAMPION of the POKéMON\l" - .string "LEAGUE one day. That’s what I think.\p" - .string "I know, since we’ve gotten to know each\n" - .string "other, let’s register one another in\l" + .string "LEAGUE one day. That's what I think.\p" + .string "I know, since we've gotten to know each\n" + .string "other, let's register one another in\l" .string "our POKéNAVS.\p" .string "… … … … … …$" @@ -116,9 +116,9 @@ GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A .string "in the POKéNAV.$" GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C - .string "Now, I’ve got to hurry along.$" + .string "Now, I've got to hurry along.$" GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA .string "Oh, your BAG is full…\n" - .string "That’s too bad, then.$" + .string "That's too bad, then.$" diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index f4d9fe0b2..100e4314d 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -50,11 +50,11 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46 end InsideOfTruck_EventScript_23BF6C:: @ 823BF6C - msgbox InsideOfTruck_Text_23BF75, 3 + msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN end InsideOfTruck_Text_23BF75: @ 823BF75 .string "The box is printed with a POKéMON logo.\p" - .string "It’s a POKéMON brand moving and\n" + .string "It's a POKéMON brand moving and\n" .string "delivery service.$" diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 647077080..e18b73a7a 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -66,7 +66,7 @@ IslandCave_EventScript_238EEF:: @ 8238EEF end IslandCave_EventScript_238F13:: @ 8238F13 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 15ac1bae6..d9a5f0849 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -48,7 +48,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB setvar VAR_0x8007, 5 special sub_8139560 waitstate - msgbox JaggedPass_Text_230DBA, 4 + msgbox JaggedPass_Text_230DBA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 @@ -78,9 +78,9 @@ JaggedPass_EventScript_230718:: @ 8230718 waitmovement 0 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230CCB, 4 + msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_GRUNT_30, 0, JaggedPass_Text_230D2D + trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D setflag FLAG_0x139 applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -90,7 +90,7 @@ JaggedPass_EventScript_230718:: @ 8230718 JaggedPass_EventScript_230766:: @ 8230766 applymovement 5, JaggedPass_Movement_27259E waitmovement 0 - msgbox JaggedPass_Text_230D65, 4 + msgbox JaggedPass_Text_230D65, MSGBOX_DEFAULT closemessage applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 @@ -98,71 +98,65 @@ JaggedPass_EventScript_230766:: @ 8230766 end JaggedPass_EventScript_230785:: @ 8230785 - trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_230888, JaggedPass_Text_2308FF - msgbox JaggedPass_Text_230916, 6 + trainerbattle_single TRAINER_ERIC, JaggedPass_Text_230888, JaggedPass_Text_2308FF + msgbox JaggedPass_Text_230916, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23079C:: @ 823079C - trainerbattle 2, TRAINER_DIANA_1, 0, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 + trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_230974, JaggedPass_Text_2309B5, JaggedPass_EventScript_2307C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_2307E4 - msgbox JaggedPass_Text_2309D8, 4 + msgbox JaggedPass_Text_2309D8, MSGBOX_DEFAULT release end JaggedPass_EventScript_2307C8:: @ 82307C8 special sub_80B4808 - msgbox JaggedPass_Text_230A2C, 4 - setvar VAR_0x8004, 474 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 474 - callstd 8 + msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT + register_matchcall TRAINER_DIANA_1 release end JaggedPass_EventScript_2307E4:: @ 82307E4 - trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_230A76, JaggedPass_Text_230AAA - msgbox JaggedPass_Text_230AD7, 6 + trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_230A76, JaggedPass_Text_230AAA + msgbox JaggedPass_Text_230AD7, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_2307FB:: @ 82307FB - trainerbattle 2, TRAINER_ETHAN_1, 0, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 + trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_230B10, JaggedPass_Text_230B50, JaggedPass_EventScript_230827 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq JaggedPass_EventScript_230843 - msgbox JaggedPass_Text_230B93, 4 + msgbox JaggedPass_Text_230B93, MSGBOX_DEFAULT release end JaggedPass_EventScript_230827:: @ 8230827 special sub_80B4808 - msgbox JaggedPass_Text_230BC6, 4 - setvar VAR_0x8004, 216 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 216 - callstd 8 + msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT + register_matchcall TRAINER_ETHAN_1 release end JaggedPass_EventScript_230843:: @ 8230843 - trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_230C28, JaggedPass_Text_230C60 - msgbox JaggedPass_Text_230C94, 6 + trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_230C28, JaggedPass_Text_230C60 + msgbox JaggedPass_Text_230C94, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_23085A:: @ 823085A - trainerbattle 0, TRAINER_JULIO, 0, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 - msgbox JaggedPass_Text_230E57, 6 + trainerbattle_single TRAINER_JULIO, JaggedPass_Text_230DF7, JaggedPass_Text_230E38 + msgbox JaggedPass_Text_230E57, MSGBOX_AUTOCLOSE end JaggedPass_EventScript_230871:: @ 8230871 - trainerbattle 0, TRAINER_AUTUMN, 0, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD - msgbox JaggedPass_Text_230EE3, 6 + trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_230E8E, JaggedPass_Text_230ECD + msgbox JaggedPass_Text_230EE3, MSGBOX_AUTOCLOSE end JaggedPass_Text_230888: @ 8230888 - .string "MT. CHIMNEY’s JAGGED PASS…\p" - .string "Now this is what I’ve always wanted\n" + .string "MT. CHIMNEY's JAGGED PASS…\p" + .string "Now this is what I've always wanted\n" .string "in a mountain.\p" .string "This jagged bumpiness…\n" .string "It rocks my soul!$" @@ -176,8 +170,8 @@ JaggedPass_Text_230916: @ 8230916 .string "the mountains, I have you beat!$" JaggedPass_Text_230974: @ 8230974 - .string "This place isn’t your casual hike.\n" - .string "It’s not suited for a picnic.$" + .string "This place isn't your casual hike.\n" + .string "It's not suited for a picnic.$" JaggedPass_Text_2309B5: @ 82309B5 .string "Ohhh, no!\n" @@ -190,7 +184,7 @@ JaggedPass_Text_2309D8: @ 82309D8 JaggedPass_Text_230A2C: @ 8230A2C .string "Will you ever be back in this area?\n" - .string "If you do return, I’d like a rematch.$" + .string "If you do return, I'd like a rematch.$" JaggedPass_Text_230A76: @ 8230A76 .string "Picnics are fun wherever you go.\n" @@ -201,24 +195,24 @@ JaggedPass_Text_230AAA: @ 8230AAA .string "too bumpy!$" JaggedPass_Text_230AD7: @ 8230AD7 - .string "I’ll forget about losing and just\n" + .string "I'll forget about losing and just\n" .string "enjoy this bumpy hike.$" JaggedPass_Text_230B10: @ 8230B10 .string "JAGGED PASS is hard to walk on.\n" - .string "It’s a good place for training.$" + .string "It's a good place for training.$" JaggedPass_Text_230B50: @ 8230B50 .string "It was all over while we were still\n" .string "trying to find a good footing…$" JaggedPass_Text_230B93: @ 8230B93 - .string "If I had an ACRO BIKE, I’d be able to\n" + .string "If I had an ACRO BIKE, I'd be able to\n" .string "jump ledges.$" JaggedPass_Text_230BC6: @ 8230BC6 .string "When I get more used to this bumpiness,\n" - .string "I’ll be sure to win!\p" + .string "I'll be sure to win!\p" .string "Can you register me in your POKéNAV?$" JaggedPass_Text_230C28: @ 8230C28 @@ -226,7 +220,7 @@ JaggedPass_Text_230C28: @ 8230C28 .string "I sing while I climb now.$" JaggedPass_Text_230C60: @ 8230C60 - .string "It’s still not easy to battle on this\n" + .string "It's still not easy to battle on this\n" .string "bumpy ground…$" JaggedPass_Text_230C94: @ 8230C94 @@ -241,13 +235,13 @@ JaggedPass_Text_230CCB: @ 8230CCB JaggedPass_Text_230D2D: @ 8230D2D .string "Urrrgh…\p" - .string "I should’ve ducked into our HIDEOUT\n" + .string "I should've ducked into our HIDEOUT\n" .string "right away…$" JaggedPass_Text_230D65: @ 8230D65 .string "Okay, oh-kay!\n" - .string "I admit it--you’re strong!\p" - .string "Don’t worry about me.\n" + .string "I admit it--you're strong!\p" + .string "Don't worry about me.\n" .string "Go wherever you want!$" JaggedPass_Text_230DBA: @ 8230DBA @@ -255,15 +249,15 @@ JaggedPass_Text_230DBA: @ 8230DBA .string "to the MAGMA EMBLEM!$" JaggedPass_Text_230DF7: @ 8230DF7 - .string "Aiyeeh! It’s awfully scary to shoot\n" + .string "Aiyeeh! It's awfully scary to shoot\n" .string "down the mountain in one go!$" JaggedPass_Text_230E38: @ 8230E38 - .string "I feel like I’m falling apart…$" + .string "I feel like I'm falling apart…$" JaggedPass_Text_230E57: @ 8230E57 .string "My bicycle bounced around so much,\n" - .string "my rear end’s sore…$" + .string "my rear end's sore…$" JaggedPass_Text_230E8E: @ 8230E8E .string "I climb this hill every day.\n" diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index efc5a2b89..a42703900 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -71,18 +71,18 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 end LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 - msgbox LavaridgeTown_Text_1EA7C0, 4 + msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EA897, 4 + msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA - msgbox LavaridgeTown_Text_1EA9A2, 4 + msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES setflag FLAG_0x0DD - msgbox LavaridgeTown_Text_1EAA2E, 4 + msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end @@ -222,27 +222,27 @@ LavaridgeTown_EventScript_1EA70B:: @ 81EA70B end LavaridgeTown_EventScript_1EA70E:: @ 81EA70E - msgbox LavaridgeTown_Text_1EAE03, 2 + msgbox LavaridgeTown_Text_1EAE03, MSGBOX_NPC end LavaridgeTown_EventScript_1EA717:: @ 81EA717 - msgbox LavaridgeTown_Text_1EAEE1, 3 + msgbox LavaridgeTown_Text_1EAEE1, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA720:: @ 81EA720 - msgbox LavaridgeTown_Text_1EAF9B, 2 + msgbox LavaridgeTown_Text_1EAF9B, MSGBOX_NPC end LavaridgeTown_EventScript_1EA729:: @ 81EA729 - msgbox LavaridgeTown_Text_1EB003, 2 + msgbox LavaridgeTown_Text_1EB003, MSGBOX_NPC end LavaridgeTown_EventScript_1EA732:: @ 81EA732 - msgbox LavaridgeTown_Text_1EB092, 2 + msgbox LavaridgeTown_Text_1EB092, MSGBOX_NPC end LavaridgeTown_EventScript_1EA73B:: @ 81EA73B - msgbox LavaridgeTown_Text_1EAF4E, 2 + msgbox LavaridgeTown_Text_1EAF4E, MSGBOX_NPC end LavaridgeTown_EventScript_1EA744:: @ 81EA744 @@ -250,13 +250,13 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 faceplayer checkflag FLAG_0x10A goto_eq LavaridgeTown_EventScript_1EA787 - msgbox LavaridgeTown_Text_1EAB80, 5 + msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LavaridgeTown_EventScript_1EA79B getpartysize compare VAR_RESULT, 6 goto_eq LavaridgeTown_EventScript_1EA791 - msgbox LavaridgeTown_Text_1EACC0, 4 + msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT setflag FLAG_0x10A playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 @@ -266,30 +266,30 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 end LavaridgeTown_EventScript_1EA787:: @ 81EA787 - msgbox LavaridgeTown_Text_1EAD9E, 4 + msgbox LavaridgeTown_Text_1EAD9E, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA791:: @ 81EA791 - msgbox LavaridgeTown_Text_1EAD09, 4 + msgbox LavaridgeTown_Text_1EAD09, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA79B:: @ 81EA79B - msgbox LavaridgeTown_Text_1EAD44, 4 + msgbox LavaridgeTown_Text_1EAD44, MSGBOX_DEFAULT release end LavaridgeTown_EventScript_1EA7A5:: @ 81EA7A5 - msgbox LavaridgeTown_Text_1EB12B, 3 + msgbox LavaridgeTown_Text_1EB12B, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7AE:: @ 81EA7AE - msgbox LavaridgeTown_Text_1EB178, 3 + msgbox LavaridgeTown_Text_1EB178, MSGBOX_SIGN end LavaridgeTown_EventScript_1EA7B7:: @ 81EA7B7 - msgbox LavaridgeTown_Text_1EB1CB, 3 + msgbox LavaridgeTown_Text_1EB1CB, MSGBOX_SIGN end LavaridgeTown_Text_1EA7C0: @ 81EA7C0 @@ -303,34 +303,34 @@ LavaridgeTown_Text_1EA7C0: @ 81EA7C0 .string "have this.$" LavaridgeTown_Text_1EA897: @ 81EA897 - .string "MAY: With those GO-GOGGLES, you’ll\n" + .string "MAY: With those GO-GOGGLES, you'll\n" .string "have no trouble getting through the\l" .string "desert near ROUTE 111.\p" .string "But, wow, {PLAYER}{KUN}…\n" .string "Challenging GYMS…\p" - .string "You’re trying hard because you don’t\n" + .string "You're trying hard because you don't\n" .string "want to lose to me, I bet!\p" .string "{PLAYER}{KUN}, I think I should challenge\n" .string "your dad in PETALBURG GYM.\p" .string "See you again!$" LavaridgeTown_Text_1EA9A2: @ 81EA9A2 - .string "BRENDAN: {PLAYER}, hey, it’s been a while.\n" - .string "How’s it going?\p" + .string "BRENDAN: {PLAYER}, hey, it's been a while.\n" + .string "How's it going?\p" .string "Hmm…\n" - .string "That’s a decent collection of BADGES.\p" + .string "That's a decent collection of BADGES.\p" .string "All right, then.\n" .string "You may as well have this.$" LavaridgeTown_Text_1EAA2E: @ 81EAA2E - .string "BRENDAN: Keep those with you if you’re\n" + .string "BRENDAN: Keep those with you if you're\n" .string "planning on going into that desert near\l" .string "ROUTE 111.\p" .string "There should be some POKéMON that\n" .string "are exclusively desert-dwellers.\l" .string "You might look around for those.\p" .string "As for me…\n" - .string "I’m considering challenging NORMAN,\l" + .string "I'm considering challenging NORMAN,\l" .string "the GYM LEADER of PETALBURG.\p" .string "Unlike you, {PLAYER}, your dad looks like\n" .string "he really is tough.\p" @@ -338,10 +338,10 @@ LavaridgeTown_Text_1EAA2E: @ 81EAA2E LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "I have here an EGG.\p" - .string "I’d hoped to hatch it by covering it in\n" + .string "I'd hoped to hatch it by covering it in\n" .string "hot sand by the hot springs.\l" - .string "But that doesn’t seem to be enough…\p" - .string "I’ve heard it would be best if it were\n" + .string "But that doesn't seem to be enough…\p" + .string "I've heard it would be best if it were\n" .string "kept together with POKéMON and\l" .string "carried about.\p" .string "You are a TRAINER, yes?\n" @@ -350,15 +350,15 @@ LavaridgeTown_Text_1EAB80: @ 81EAB80 .string "Will you take this EGG to hatch?$" LavaridgeTown_Text_1EACC0: @ 81EACC0 - .string "Good! I hope you’ll walk plenty with\n" + .string "Good! I hope you'll walk plenty with\n" .string "this here EGG!$" LavaridgeTown_Text_1EACF4: @ 81EACF4 .string "{PLAYER} received the EGG.$" LavaridgeTown_Text_1EAD09: @ 81EAD09 - .string "Oh? You’ve too many POKéMON.\n" - .string "There’s no room for this EGG…$" + .string "Oh? You've too many POKéMON.\n" + .string "There's no room for this EGG…$" LavaridgeTown_Text_1EAD44: @ 81EAD44 .string "As you wish, then…\p" @@ -368,12 +368,12 @@ LavaridgeTown_Text_1EAD44: @ 81EAD44 LavaridgeTown_Text_1EAD9E: @ 81EAD9E .string "Every so often, an EGG will be found at\n" .string "the POKéMON DAY CARE.\p" - .string "Or at least that’s how the rumor goes.$" + .string "Or at least that's how the rumor goes.$" LavaridgeTown_Text_1EAE03: @ 81EAE03 .string "We draw as much hot water as we need,\n" .string "and yet the hot springs never run dry.\p" - .string "Isn’t it magical?\p" + .string "Isn't it magical?\p" .string "These hot springs appear near active\n" .string "volcanoes. Veins of water under the\l" .string "ground are heated by magma to well up\l" @@ -388,7 +388,7 @@ LavaridgeTown_Text_1EAEE1: @ 81EAEE1 LavaridgeTown_Text_1EAF4E: @ 81EAF4E .string "Oh, you like hot springs, do you?\p" - .string "That’s surprising for one as young\n" + .string "That's surprising for one as young\n" .string "as you.$" LavaridgeTown_Text_1EAF9B: @ 81EAF9B @@ -403,7 +403,7 @@ LavaridgeTown_Text_1EB003: @ 81EB003 .string "a bubble bath, or even a lava bath…$" LavaridgeTown_Text_1EB092: @ 81EB092 - .string "They’re claiming that these hot springs\n" + .string "They're claiming that these hot springs\n" .string "are good for calming nervous tension,\l" .string "relieving aching muscles, solving\l" .string "romantic problems, and attracting\l" diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index a0c2e1514..6a795a74c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -59,13 +59,13 @@ LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C - trainerbattle 1, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1 + trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF0DC, LavaridgeTown_Gym_1F_Text_1FF233, LavaridgeTown_Gym_1F_EventScript_1FE7C1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE864 checkflag FLAG_0x0A8 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1FE81D - msgbox LavaridgeTown_Gym_1F_Text_1FF546, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 message LavaridgeTown_Gym_1F_Text_1FF32F waitmessage call LavaridgeTown_Gym_1F_EventScript_27207E - msgbox LavaridgeTown_Gym_1F_Text_1FF359, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT setflag FLAG_0x06C setflag FLAG_0x4F3 setflag FLAG_BADGE04_GET @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox LavaridgeTown_Gym_1F_Text_1FF517, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF517, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_272054 - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 release end @@ -109,18 +109,18 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 giveitem_std ITEM_TM50 compare VAR_RESULT, 0 goto_eq LavaridgeTown_Gym_1F_EventScript_27205E - msgbox LavaridgeTown_Gym_1F_Text_1FF45C, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT setflag FLAG_0x0A8 return LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 - trainerbattle 7, TRAINER_FLANNERY_1, 0, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E - msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, 6 + trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_1FF601, LavaridgeTown_Gym_1F_Text_1FF69F, LavaridgeTown_Gym_1F_Text_1FF75E + msgbox LavaridgeTown_Gym_1F_Text_1FF6BF, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE87F:: @ 81FE87F - trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_1FEADE, LavaridgeTown_Gym_1F_Text_1FEAFB, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEB1C, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE89A:: @ 81FE89A @@ -133,38 +133,38 @@ LavaridgeTown_Gym_B1F_EventScript_1FE89A:: @ 81FE89A end LavaridgeTown_Gym_1F_EventScript_1FE8AF:: @ 81FE8AF - trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1FEB7B, LavaridgeTown_Gym_1F_Text_1FEBC0, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEBE1, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE8CA:: @ 81FE8CA - trainerbattle 2, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FED02, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, 2, LavaridgeTown_Gym_B1F_Text_1FEC31, LavaridgeTown_Gym_B1F_Text_1FECE3, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FED02, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE8E5:: @ 81FE8E5 - trainerbattle 2, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, 5, LavaridgeTown_Gym_1F_Text_1FEE22, LavaridgeTown_Gym_1F_Text_1FEE42, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEE5D, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE900:: @ 81FE900 - trainerbattle 2, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, 3, LavaridgeTown_Gym_1F_Text_1FED72, LavaridgeTown_Gym_1F_Text_1FED9E, LavaridgeTown_Gym_1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_1F_Text_1FEDBB, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE91B:: @ 81FE91B - trainerbattle 2, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, 1, LavaridgeTown_Gym_B1F_Text_1FEE9D, LavaridgeTown_Gym_B1F_Text_1FEED5, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEF07, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE936:: @ 81FE936 - trainerbattle 2, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, 3, LavaridgeTown_Gym_B1F_Text_1FEF60, LavaridgeTown_Gym_B1F_Text_1FEFA7, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FEFC2, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 - trainerbattle 2, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A - msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, 6 + trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, 4, LavaridgeTown_Gym_B1F_Text_1FF025, LavaridgeTown_Gym_B1F_Text_1FF05F, LavaridgeTown_Gym_B1F_EventScript_1FE89A + msgbox LavaridgeTown_Gym_B1F_Text_1FF09A, MSGBOX_AUTOCLOSE end LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C @@ -172,12 +172,12 @@ LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C faceplayer checkflag FLAG_0x4F3 goto_eq LavaridgeTown_Gym_1F_EventScript_1FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end LavaridgeTown_Gym_1F_EventScript_1FE981:: @ 81FE981 - msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FEAB8, MSGBOX_DEFAULT release end @@ -196,23 +196,23 @@ LavaridgeTown_Gym_1F_EventScript_1FE99B:: @ 81FE99B end LavaridgeTown_Gym_1F_EventScript_1FE9AB:: @ 81FE9AB - msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5C4, MSGBOX_DEFAULT releaseall end LavaridgeTown_Gym_1F_EventScript_1FE9B5:: @ 81FE9B5 - msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, 4 + msgbox LavaridgeTown_Gym_1F_Text_1FF5A9, MSGBOX_DEFAULT releaseall end LavaridgeTown_Gym_1F_Text_1FE9BF: @ 81FE9BF - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "LAVARIDGE’s GYM LEADER FLANNERY\n" + .string "LAVARIDGE's GYM LEADER FLANNERY\n" .string "uses FIRE-type POKéMON.\p" .string "Her passion for POKéMON burns stronger\n" .string "and hotter than a volcano.\p" - .string "Don’t get too close to her--you’ll burn!\n" + .string "Don't get too close to her--you'll burn!\n" .string "Hose her down with water and then\l" .string "go for it!$" @@ -221,20 +221,20 @@ LavaridgeTown_Gym_1F_Text_1FEAB8: @ 81FEAB8 LavaridgeTown_Gym_1F_Text_1FEADE: @ 81FEADE .string "Owowowowow!\n" - .string "Yikes, it’s hot!$" + .string "Yikes, it's hot!$" LavaridgeTown_Gym_1F_Text_1FEAFB: @ 81FEAFB - .string "I’m blinded by sweat in my eyes…$" + .string "I'm blinded by sweat in my eyes…$" LavaridgeTown_Gym_1F_Text_1FEB1C: @ 81FEB1C .string "Being buried in hot sand promotes\n" .string "circulation.\p" - .string "It’s effective for healing pain in\n" + .string "It's effective for healing pain in\n" .string "your joints.$" LavaridgeTown_Gym_1F_Text_1FEB7B: @ 81FEB7B - .string "I’m trying to relieve my stress.\n" - .string "Don’t come along and stress me out!$" + .string "I'm trying to relieve my stress.\n" + .string "Don't come along and stress me out!$" LavaridgeTown_Gym_1F_Text_1FEBC0: @ 81FEBC0 .string "I hope FLANNERY flames you good!$" @@ -246,8 +246,8 @@ LavaridgeTown_Gym_1F_Text_1FEBE1: @ 81FEBE1 LavaridgeTown_Gym_B1F_Text_1FEC31: @ 81FEC31 .string "You must be getting tired by now.\n" - .string "You’d like to rest in the hot sand,\l" - .string "wouldn’t you?\p" + .string "You'd like to rest in the hot sand,\l" + .string "wouldn't you?\p" .string "But you should know that maintaining\n" .string "your willpower is an important ability\l" .string "for all TRAINERS.$" @@ -258,7 +258,7 @@ LavaridgeTown_Gym_B1F_Text_1FECE3: @ 81FECE3 LavaridgeTown_Gym_B1F_Text_1FED02: @ 81FED02 .string "Your skill is real…\n" .string "But our LEADER FLANNERY is strong.\p" - .string "If you don’t watch yourself, you’ll be\n" + .string "If you don't watch yourself, you'll be\n" .string "burned seriously.$" LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 @@ -266,7 +266,7 @@ LavaridgeTown_Gym_1F_Text_1FED72: @ 81FED72 .string "392-degree heat?$" LavaridgeTown_Gym_1F_Text_1FED9E: @ 81FED9E - .string "It didn’t burn hotly enough…$" + .string "It didn't burn hotly enough…$" LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB .string "The temperature of magma is\n" @@ -276,21 +276,21 @@ LavaridgeTown_Gym_1F_Text_1FEDBB: @ 81FEDBB LavaridgeTown_Gym_1F_Text_1FEE22: @ 81FEE22 .string "Um…\n" - .string "Okay, I’ll battle with you.$" + .string "Okay, I'll battle with you.$" LavaridgeTown_Gym_1F_Text_1FEE42: @ 81FEE42 - .string "Oh, but you’re too strong.$" + .string "Oh, but you're too strong.$" LavaridgeTown_Gym_1F_Text_1FEE5D: @ 81FEE5D - .string "I’m going to be a pretty and strong\n" + .string "I'm going to be a pretty and strong\n" .string "TRAINER just like FLANNERY.$" LavaridgeTown_Gym_B1F_Text_1FEE9D: @ 81FEE9D .string "Come on, get with it!\n" - .string "Let’s go before my feelings cool!$" + .string "Let's go before my feelings cool!$" LavaridgeTown_Gym_B1F_Text_1FEED5: @ 81FEED5 - .string "It’s so hot, and yet my heart is\n" + .string "It's so hot, and yet my heart is\n" .string "clutched by ice…$" LavaridgeTown_Gym_B1F_Text_1FEF07: @ 81FEF07 @@ -303,12 +303,12 @@ LavaridgeTown_Gym_B1F_Text_1FEF60: @ 81FEF60 .string "They flare in anticipation of my win!$" LavaridgeTown_Gym_B1F_Text_1FEFA7: @ 81FEFA7 - .string "Something didn’t go right.$" + .string "Something didn't go right.$" LavaridgeTown_Gym_B1F_Text_1FEFC2: @ 81FEFC2 .string "Well, so what? I say so what?\n" .string "I can walk on hot coals barefoot!\p" - .string "…Don’t even think about trying it!$" + .string "…Don't even think about trying it!$" LavaridgeTown_Gym_B1F_Text_1FF025: @ 81FF025 .string "As much as I love mountains,\n" @@ -320,16 +320,16 @@ LavaridgeTown_Gym_B1F_Text_1FF05F: @ 81FF05F LavaridgeTown_Gym_B1F_Text_1FF09A: @ 81FF09A .string "I stay here because I became a fan\n" - .string "of FLANNERY’s power.\p" + .string "of FLANNERY's power.\p" .string "Hehehehe.$" LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC .string "Welcome… No, wait.\p" - .string "Puny TRAINER, how good to see you’ve\n" + .string "Puny TRAINER, how good to see you've\n" .string "made it here!\p" .string "I have been entrusted with the…\n" .string "No, wait.\p" - .string "I am FLANNERY, and I’m the GYM\n" + .string "I am FLANNERY, and I'm the GYM\n" .string "LEADER here!\p" .string "Uh…\n" .string "Dare not underestimate me, though\l" @@ -341,12 +341,12 @@ LavaridgeTown_Gym_1F_Text_1FF0DC: @ 81FF0DC LavaridgeTown_Gym_1F_Text_1FF233: @ 81FF233 .string "Oh…\n" .string "I guess I was trying too hard…\p" - .string "I… I’ve only recently become\n" + .string "I… I've only recently become\n" .string "a GYM LEADER.\p" .string "I tried too hard to be someone\n" - .string "I’m not.\p" + .string "I'm not.\p" .string "I have to do things my natural way. If\n" - .string "I don’t, my POKéMON will be confused.\p" + .string "I don't, my POKéMON will be confused.\p" .string "Thanks for teaching me that.\n" .string "For that, you deserve this.$" @@ -362,7 +362,7 @@ LavaridgeTown_Gym_1F_Text_1FF359: @ 81FF359 .string "And, it lets POKéMON use the HM move\n" .string "STRENGTH outside of battle.\p" .string "This is a token of my appreciation.\n" - .string "Don’t be shy about taking it!$" + .string "Don't be shy about taking it!$" LavaridgeTown_Gym_1F_Text_1FF45C: @ 81FF45C .string "That TM50 contains OVERHEAT.\p" @@ -386,16 +386,16 @@ LavaridgeTown_Gym_1F_Text_1FF5A9: @ 81FF5A9 LavaridgeTown_Gym_1F_Text_1FF5C4: @ 81FF5C4 .string "LAVARIDGE TOWN POKéMON GYM\p" - .string "FLANNERY’S CERTIFIED TRAINERS:\n" + .string "FLANNERY'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" LavaridgeTown_Gym_1F_Text_1FF601: @ 81FF601 - .string "FLANNERY: Losing a battle isn’t going\n" + .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" .string "I love to battle.\l" .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" + .string "Let's exchange superhot moves\n" .string "in another battle!$" LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F @@ -404,19 +404,19 @@ LavaridgeTown_Gym_1F_Text_1FF69F: @ 81FF69F LavaridgeTown_Gym_1F_Text_1FF6BF: @ 81FF6BF .string "FLANNERY: I lost the match,\n" - .string "but I’m completely satisfied.\p" - .string "It’s not often I get to enjoy a battle\n" + .string "but I'm completely satisfied.\p" + .string "It's not often I get to enjoy a battle\n" .string "this heated.\p" - .string "Let’s have another one like this\n" + .string "Let's have another one like this\n" .string "again sometime!$" LavaridgeTown_Gym_1F_Text_1FF75E: @ 81FF75E - .string "FLANNERY: Losing a battle isn’t going\n" + .string "FLANNERY: Losing a battle isn't going\n" .string "to deflate me.\p" .string "I love POKéMON.\n" .string "I love to battle.\l" .string "And… I love this GYM!\p" - .string "Let’s exchange superhot moves\n" + .string "Let's exchange superhot moves\n" .string "in another battle!\p" .string "Oh, wait. Do you only have one POKéMON\n" .string "that can battle?\p" diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 6af8132e4..b1d776fbd 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_1FE4D7:: @ 81FE4D7 message LavaridgeTown_HerbShop_Text_1FE53E waitmessage pokemart LavaridgeTown_HerbShop_Pokemart_1FE4F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -22,7 +22,7 @@ LavaridgeTown_HerbShop_Pokemart_1FE4F0: @ 81FE4F0 end LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC - msgbox LavaridgeTown_HerbShop_Text_1FE685, 2 + msgbox LavaridgeTown_HerbShop_Text_1FE685, MSGBOX_NPC end LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 @@ -30,7 +30,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 faceplayer checkflag FLAG_0x0FE goto_eq LavaridgeTown_HerbShop_EventScript_1FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE584, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_eq LavaridgeTown_HerbShop_EventScript_272054 @@ -39,7 +39,7 @@ LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 end LavaridgeTown_HerbShop_EventScript_1FE534:: @ 81FE534 - msgbox LavaridgeTown_HerbShop_Text_1FE5EB, 4 + msgbox LavaridgeTown_HerbShop_Text_1FE5EB, MSGBOX_DEFAULT release end @@ -48,13 +48,13 @@ LavaridgeTown_HerbShop_Text_1FE53E: @ 81FE53E .string "effective and inexpensive medicine!$" LavaridgeTown_HerbShop_Text_1FE584: @ 81FE584 - .string "You’ve come to look at herbal medicine\n" + .string "You've come to look at herbal medicine\n" .string "in LAVARIDGE?\p" - .string "That’s rather commendable.\p" + .string "That's rather commendable.\p" .string "I like you! Take this!$" LavaridgeTown_HerbShop_Text_1FE5EB: @ 81FE5EB - .string "That CHARCOAL I gave you, it’s used\n" + .string "That CHARCOAL I gave you, it's used\n" .string "for making herbal medicine.\p" .string "It also does wonders when held by\n" .string "a POKéMON.\p" diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc index 14d112de9..2dc6bc76e 100644 --- a/data/maps/LavaridgeTown_House/scripts.inc +++ b/data/maps/LavaridgeTown_House/scripts.inc @@ -2,7 +2,7 @@ LavaridgeTown_House_MapScripts:: @ 81FF911 .byte 0 LavaridgeTown_House_EventScript_1FF912:: @ 81FF912 - msgbox LavaridgeTown_House_Text_1FF92E, 2 + msgbox LavaridgeTown_House_Text_1FF92E, MSGBOX_NPC end LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B @@ -10,13 +10,13 @@ LavaridgeTown_House_EventScript_1FF91B:: @ 81FF91B faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox LavaridgeTown_House_Text_1FF9BB, 4 + msgbox LavaridgeTown_House_Text_1FF9BB, MSGBOX_DEFAULT waitmoncry release end LavaridgeTown_House_Text_1FF92E: @ 81FF92E - .string "My wife’s warming an EGG in the hot\n" + .string "My wife's warming an EGG in the hot\n" .string "springs. This is what she told me.\p" .string "She left two POKéMON with the DAY CARE.\n" .string "And they discovered that EGG!$" diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index 2c5681983..ff9772b1d 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_Mart_EventScript_1FF9CE:: @ 81FF9CE message gUnknown_08272A21 waitmessage pokemart LavaridgeTown_Mart_Pokemart_1FF9E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,21 +27,21 @@ LavaridgeTown_Mart_Pokemart_1FF9E8: @ 81FF9E8 end LavaridgeTown_Mart_EventScript_1FF9FE:: @ 81FF9FE - msgbox LavaridgeTown_Mart_Text_1FFA10, 2 + msgbox LavaridgeTown_Mart_Text_1FFA10, MSGBOX_NPC end LavaridgeTown_Mart_EventScript_1FFA07:: @ 81FFA07 - msgbox LavaridgeTown_Mart_Text_1FFA83, 2 + msgbox LavaridgeTown_Mart_Text_1FFA83, MSGBOX_NPC end LavaridgeTown_Mart_Text_1FFA10: @ 81FFA10 - .string "Use X SPEED to add to a POKéMON’s\n" + .string "Use X SPEED to add to a POKéMON's\n" .string "SPEED in battle.\p" .string "That will help it get in the first\n" .string "strike--a decided advantage!$" LavaridgeTown_Mart_Text_1FFA83: @ 81FFA83 - .string "On MT. CHIMNEY’s peak, there’s a local\n" + .string "On MT. CHIMNEY's peak, there's a local\n" .string "specialty that you can buy only there.\p" .string "Give it to a POKéMON--it will be elated.$" diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index c7db56a0d..f4fabbf72 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -17,25 +17,25 @@ LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E:: @ 81FFB0E end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C:: @ 81FFB1C - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFBAD, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25:: @ 81FFB25 - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFB37, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E:: @ 81FFB2E - msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, 2 + msgbox LavaridgeTown_PokemonCenter_1F_Text_1FFC21, MSGBOX_NPC end LavaridgeTown_PokemonCenter_1F_Text_1FFB37: @ 81FFB37 .string "I think POKéMON get closer to their\n" .string "TRAINERS if they spend time together.\p" .string "The longer the better.\n" - .string "That’s what I think.$" + .string "That's what I think.$" LavaridgeTown_PokemonCenter_1F_Text_1FFBAD: @ 81FFBAD - .string "It’s sort of magical how just sitting\n" + .string "It's sort of magical how just sitting\n" .string "in a hot-spring pool can invigorate.\p" .string "I wish I could let my POKéMON\n" .string "soak, too.$" diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 54fead4ef..83b258c7e 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -38,24 +38,24 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 dodailyevents checkflag FLAG_0x92F goto_eq LilycoveCity_EventScript_1E2C18 - msgbox LilycoveCity_Text_2A7244, 4 + msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_272054 setflag FLAG_0x92F - msgbox LilycoveCity_Text_2A72E3, 4 + msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C18:: @ 81E2C18 - msgbox LilycoveCity_Text_2A7321, 4 + msgbox LilycoveCity_Text_2A7321, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C22:: @ 81E2C22 - msgbox LilycoveCity_Text_1E3D9E, 2 + msgbox LilycoveCity_Text_1E3D9E, MSGBOX_NPC end LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B @@ -63,17 +63,17 @@ LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2C40 - msgbox LilycoveCity_Text_1E3E3C, 4 + msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C40:: @ 81E2C40 - msgbox LilycoveCity_Text_1E3E7D, 4 + msgbox LilycoveCity_Text_1E3E7D, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A - msgbox LilycoveCity_Text_1E3F05, 2 + msgbox LilycoveCity_Text_1E3F05, MSGBOX_NPC end LilycoveCity_EventScript_1E2C53:: @ 81E2C53 @@ -81,12 +81,12 @@ LilycoveCity_EventScript_1E2C53:: @ 81E2C53 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C68 - msgbox LilycoveCity_Text_1E3FAB, 4 + msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C68:: @ 81E2C68 - msgbox LilycoveCity_Text_1E4020, 4 + msgbox LilycoveCity_Text_1E4020, MSGBOX_DEFAULT release end @@ -95,25 +95,25 @@ LilycoveCity_EventScript_1E2C72:: @ 81E2C72 faceplayer checkflag FLAG_0x070 goto_eq LilycoveCity_EventScript_1E2C87 - msgbox LilycoveCity_Text_1E40AD, 4 + msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C87:: @ 81E2C87 - msgbox LilycoveCity_Text_1E4145, 4 + msgbox LilycoveCity_Text_1E4145, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2C91:: @ 81E2C91 - msgbox LilycoveCity_Text_1E417B, 2 + msgbox LilycoveCity_Text_1E417B, MSGBOX_NPC end LilycoveCity_EventScript_1E2C9A:: @ 81E2C9A - msgbox LilycoveCity_Text_1E420B, 3 + msgbox LilycoveCity_Text_1E420B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3 - msgbox LilycoveCity_Text_1E4283, 3 + msgbox LilycoveCity_Text_1E4283, MSGBOX_SIGN end LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC @@ -121,45 +121,45 @@ LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_EventScript_1E2CC1 - msgbox LilycoveCity_Text_1E42FC, 4 + msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CC1:: @ 81E2CC1 - msgbox LilycoveCity_Text_1E43FF, 4 + msgbox LilycoveCity_Text_1E43FF, MSGBOX_DEFAULT release end LilycoveCity_EventScript_1E2CCB:: @ 81E2CCB - msgbox LilycoveCity_Text_1E48A5, 2 + msgbox LilycoveCity_Text_1E48A5, MSGBOX_NPC end LilycoveCity_EventScript_1E2CD4:: @ 81E2CD4 - msgbox LilycoveCity_Text_1E4902, 2 + msgbox LilycoveCity_Text_1E4902, MSGBOX_NPC end LilycoveCity_EventScript_1E2CDD:: @ 81E2CDD lockall - msgbox LilycoveCity_Text_1E494D, 2 + msgbox LilycoveCity_Text_1E494D, MSGBOX_NPC applymovement 20, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CEE:: @ 81E2CEE lockall - msgbox LilycoveCity_Text_1E49F4, 2 + msgbox LilycoveCity_Text_1E49F4, MSGBOX_NPC applymovement 19, LilycoveCity_Movement_2725A2 end LilycoveCity_EventScript_1E2CFF:: @ 81E2CFF - msgbox LilycoveCity_Text_1E448B, 3 + msgbox LilycoveCity_Text_1E448B, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D08:: @ 81E2D08 - msgbox LilycoveCity_Text_1E44C3, 3 + msgbox LilycoveCity_Text_1E44C3, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D11:: @ 81E2D11 - msgbox LilycoveCity_Text_1E44FC, 3 + msgbox LilycoveCity_Text_1E44FC, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A @@ -167,12 +167,12 @@ LilycoveCity_EventScript_1E2D1A:: @ 81E2D1A specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 0, LilycoveCity_EventScript_1E2D3A - msgbox LilycoveCity_Text_1E4571, 4 + msgbox LilycoveCity_Text_1E4571, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A - msgbox LilycoveCity_Text_1E4534, 4 + msgbox LilycoveCity_Text_1E4534, MSGBOX_DEFAULT releaseall end @@ -180,35 +180,35 @@ LilycoveCity_EventScript_1E2D44:: @ 81E2D44 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2D58 - msgbox LilycoveCity_Text_1E45A7, 4 + msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D58:: @ 81E2D58 - msgbox LilycoveCity_Text_1E4624, 4 + msgbox LilycoveCity_Text_1E4624, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2D62:: @ 81E2D62 - msgbox LilycoveCity_Text_1E466E, 3 + msgbox LilycoveCity_Text_1E466E, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D6B:: @ 81E2D6B - msgbox LilycoveCity_Text_1E46BE, 3 + msgbox LilycoveCity_Text_1E46BE, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D74:: @ 81E2D74 - msgbox LilycoveCity_Text_1E473D, 3 + msgbox LilycoveCity_Text_1E473D, MSGBOX_SIGN end LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall checkflag FLAG_0x0DA goto_eq LilycoveCity_EventScript_1E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 - msgbox LilycoveCity_Text_1E3D4A, 4 + msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 waitmovement 0 setflag FLAG_0x0DA @@ -216,24 +216,24 @@ LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D end LilycoveCity_EventScript_1E2DB0:: @ 81E2DB0 - msgbox LilycoveCity_Text_1E3D1F, 4 + msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT releaseall end LilycoveCity_EventScript_1E2DBA:: @ 81E2DBA - msgbox LilycoveCity_Text_1E3B2C, 2 + msgbox LilycoveCity_Text_1E3B2C, MSGBOX_NPC end LilycoveCity_EventScript_1E2DC3:: @ 81E2DC3 - msgbox LilycoveCity_Text_1E3B95, 2 + msgbox LilycoveCity_Text_1E3B95, MSGBOX_NPC end LilycoveCity_EventScript_1E2DCC:: @ 81E2DCC - msgbox LilycoveCity_Text_1E3C46, 2 + msgbox LilycoveCity_Text_1E3C46, MSGBOX_NPC end LilycoveCity_EventScript_1E2DD5:: @ 81E2DD5 - msgbox LilycoveCity_Text_1E3CBE, 2 + msgbox LilycoveCity_Text_1E3CBE, MSGBOX_NPC end LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE @@ -254,7 +254,7 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 call_if 0, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2E5A - msgbox LilycoveCity_Text_1E3234, 4 + msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2EDE case 1, LilycoveCity_EventScript_1E2EEE @@ -262,16 +262,16 @@ LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 end LilycoveCity_EventScript_1E2E48:: @ 81E2E48 - msgbox LilycoveCity_Text_1E31F5, 5 + msgbox LilycoveCity_Text_1E31F5, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E51:: @ 81E2E51 - msgbox LilycoveCity_Text_1E3061, 5 + msgbox LilycoveCity_Text_1E3061, MSGBOX_YESNO return LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E318D, 4 + msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release @@ -285,7 +285,7 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B call_if 0, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 goto_eq LilycoveCity_EventScript_1E2ECD - msgbox LilycoveCity_Text_1E373C, 4 + msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_1E2F0E case 1, LilycoveCity_EventScript_1E2F1E @@ -293,53 +293,53 @@ LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B end LilycoveCity_EventScript_1E2EBB:: @ 81E2EBB - msgbox LilycoveCity_Text_1E36FA, 5 + msgbox LilycoveCity_Text_1E36FA, MSGBOX_YESNO return LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 - msgbox LilycoveCity_Text_1E3608, 5 + msgbox LilycoveCity_Text_1E3608, MSGBOX_YESNO return LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD setflag FLAG_0x11E - msgbox LilycoveCity_Text_1E36BF, 4 + msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm release end LilycoveCity_EventScript_1E2EDE:: @ 81E2EDE - trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EEE:: @ 81E2EEE - trainerbattle 3, TRAINER_MAY_13, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2EFE:: @ 81E2EFE - trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_1E3275 + trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_1E3275 goto LilycoveCity_EventScript_1E2F3E end LilycoveCity_EventScript_1E2F0E:: @ 81E2F0E - trainerbattle 3, TRAINER_BRENDAN_14, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F1E:: @ 81E2F1E - trainerbattle 3, TRAINER_BRENDAN_15, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E - trainerbattle 3, TRAINER_BRENDAN_13, 0, LilycoveCity_Text_1E3777 + trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_1E3777 goto LilycoveCity_EventScript_1E2FAA end LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E - msgbox LilycoveCity_Text_1E32FB, 4 + msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -362,21 +362,21 @@ LilycoveCity_EventScript_1E2F80:: @ 81E2F80 return LilycoveCity_EventScript_1E2F86:: @ 81E2F86 - msgbox LilycoveCity_Text_1E3398, 4 + msgbox LilycoveCity_Text_1E3398, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FA1 - msgbox LilycoveCity_Text_1E346D, 4 + msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1 - msgbox LilycoveCity_Text_1E353A, 4 + msgbox LilycoveCity_Text_1E353A, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA - msgbox LilycoveCity_Text_1E37D7, 4 + msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT setvar VAR_RESULT, 0 checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_1E2F76 @@ -390,17 +390,17 @@ LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA end LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2 - msgbox LilycoveCity_Text_1E3876, 4 + msgbox LilycoveCity_Text_1E3876, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_EventScript_1E2FFD - msgbox LilycoveCity_Text_1E390C, 4 + msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD - msgbox LilycoveCity_Text_1E39E3, 4 + msgbox LilycoveCity_Text_1E39E3, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3006:: @ 81E3006 @@ -422,7 +422,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 LilycoveCity_EventScript_1E302D:: @ 81E302D lock faceplayer - msgbox LilycoveCity_Text_1E4774, 5 + msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, LilycoveCity_EventScript_1E304F compare VAR_RESULT, 0 @@ -431,11 +431,11 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D end LilycoveCity_EventScript_1E304F:: @ 81E304F - msgbox LilycoveCity_Text_1E47A1, 4 + msgbox LilycoveCity_Text_1E47A1, MSGBOX_DEFAULT return LilycoveCity_EventScript_1E3058:: @ 81E3058 - msgbox LilycoveCity_Text_1E4824, 4 + msgbox LilycoveCity_Text_1E4824, MSGBOX_DEFAULT return LilycoveCity_Text_1E3061: @ 81E3061 @@ -443,18 +443,18 @@ LilycoveCity_Text_1E3061: @ 81E3061 .string "{PLAYER}{KUN}, are you shopping, too?\p" .string "I bought a whole bunch of DOLLS and\n" .string "POSTERS.\p" - .string "Of course, I’ve also caught a lot of\n" - .string "POKéMON, and I’m raising them\l" + .string "Of course, I've also caught a lot of\n" + .string "POKéMON, and I'm raising them\l" .string "properly, too.\p" - .string "Actually, I’m more worried if you’re\n" + .string "Actually, I'm more worried if you're\n" .string "raising POKéMON properly, {PLAYER}{KUN}.\p" - .string "I’ll battle with you, so you can show\n" + .string "I'll battle with you, so you can show\n" .string "me your POKéMON, {PLAYER}{KUN}.$" LilycoveCity_Text_1E318D: @ 81E318D - .string "MAY: Oh, why? {PLAYER}{KUN}, haven’t you\n" + .string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n" .string "been raising your POKéMON?\p" - .string "That’s not a very good showing as a\n" + .string "That's not a very good showing as a\n" .string "TRAINER…$" LilycoveCity_Text_1E31F5: @ 81E31F5 @@ -462,7 +462,7 @@ LilycoveCity_Text_1E31F5: @ 81E31F5 .string "check out your POKéMON!$" LilycoveCity_Text_1E3234: @ 81E3234 - .string "MAY: The POKéMON I raised won’t be\n" + .string "MAY: The POKéMON I raised won't be\n" .string "beaten by your POKéMON, {PLAYER}{KUN}!$" LilycoveCity_Text_1E3275: @ 81E3275 @@ -470,22 +470,22 @@ LilycoveCity_Text_1E3275: @ 81E3275 .string "I remember the battle I had with you,\n" .string "{PLAYER}{KUN}, on ROUTE 103.\p" .string "That battle helped you become this\n" - .string "strong, {PLAYER}{KUN}, didn’t it?$" + .string "strong, {PLAYER}{KUN}, didn't it?$" LilycoveCity_Text_1E32FB: @ 81E32FB - .string "MAY: I’m thinking of going back to\n" + .string "MAY: I'm thinking of going back to\n" .string "LITTLEROOT soon.\p" - .string "I’ve caught a decent group of POKéMON,\n" + .string "I've caught a decent group of POKéMON,\n" .string "and my POKéDEX is coming along, so\l" - .string "I’m going home to show my dad.$" + .string "I'm going home to show my dad.$" LilycoveCity_Text_1E3398: @ 81E3398 .string "{PLAYER}{KUN}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" - .string "Well, while you’re collecting BADGES,\n" - .string "{PLAYER}{KUN}, I’m going to work on my\l" - .string "POKéDEX. I’ll complete it before you!\p" + .string "Well, while you're collecting BADGES,\n" + .string "{PLAYER}{KUN}, I'm going to work on my\l" + .string "POKéDEX. I'll complete it before you!\p" .string "See you!$" LilycoveCity_Text_1E346D: @ 81E346D @@ -494,8 +494,8 @@ LilycoveCity_Text_1E346D: @ 81E346D .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" + .string "I might've lost to you in battling,\n" + .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" LilycoveCity_Text_1E353A: @ 81E353A @@ -504,53 +504,53 @@ LilycoveCity_Text_1E353A: @ 81E353A .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "I might’ve lost to you in battling,\n" - .string "but I’ll finish my POKéDEX before you!\p" + .string "I might've lost to you in battling,\n" + .string "but I'll finish my POKéDEX before you!\p" .string "See you!$" LilycoveCity_Text_1E3608: @ 81E3608 - .string "BRENDAN: Oh, hey, it’s {PLAYER}.\p" - .string "I’m running an errand for my dad.\n" - .string "No, I’m not buying any DOLLS.\p" - .string "Anyways, it’s been a while.\p" - .string "Want to have a battle to see who’s been\n" + .string "BRENDAN: Oh, hey, it's {PLAYER}.\p" + .string "I'm running an errand for my dad.\n" + .string "No, I'm not buying any DOLLS.\p" + .string "Anyways, it's been a while.\p" + .string "Want to have a battle to see who's been\n" .string "raising POKéMON better?$" LilycoveCity_Text_1E36BF: @ 81E36BF - .string "BRENDAN: Oh, what’s the matter?\n" - .string "Don’t have the confidence?$" + .string "BRENDAN: Oh, what's the matter?\n" + .string "Don't have the confidence?$" LilycoveCity_Text_1E36FA: @ 81E36FA - .string "BRENDAN: Want to battle to see who’s\n" + .string "BRENDAN: Want to battle to see who's\n" .string "been raising POKéMON better?$" LilycoveCity_Text_1E373C: @ 81E373C - .string "BRENDAN: Aww, but you know I’m not\n" + .string "BRENDAN: Aww, but you know I'm not\n" .string "going to lose to no {PLAYER}.$" LilycoveCity_Text_1E3777: @ 81E3777 .string "Humph…\n" - .string "You’ve done a lot of raising.\p" + .string "You've done a lot of raising.\p" .string "That stings a bit--I had a head start\n" .string "on you as a TRAINER…$" LilycoveCity_Text_1E37D7: @ 81E37D7 .string "BRENDAN: I…\n" .string "I plan on going home to LITTLEROOT.\p" - .string "You know I’m helping out my dad on his\n" - .string "POKéDEX. It’s coming together pretty\l" + .string "You know I'm helping out my dad on his\n" + .string "POKéDEX. It's coming together pretty\l" .string "decently, so I should go show him.$" LilycoveCity_Text_1E3876: @ 81E3876 .string "{PLAYER}, what are you going to do?\p" .string "Collect all the GYM BADGES and take\n" .string "the POKéMON LEAGUE challenge?\p" - .string "Maybe I’ll do that, too…\p" + .string "Maybe I'll do that, too…\p" .string "Well, anyway, hang in there!$" LilycoveCity_Text_1E390C: @ 81E390C .string "{PLAYER}, what are you going to do?\p" - .string "Since you’re that strong, are you\n" + .string "Since you're that strong, are you\n" .string "taking the POKéMON LEAGUE challenge?\p" .string "Heh, even me--if I trained my POKéMON\n" .string "a bit more, I should be stronger than\l" @@ -563,10 +563,10 @@ LilycoveCity_Text_1E39E3: @ 81E39E3 .string "challenge?\p" .string "Or, are you going to complete your\n" .string "POKéDEX?\p" - .string "Since you’re that strong, you should\n" + .string "Since you're that strong, you should\n" .string "consider the BATTLE FRONTIER.\p" .string "Heh, if I train my POKéMON a bit more,\n" - .string "I’ll get stronger than you, {PLAYER}.\p" + .string "I'll get stronger than you, {PLAYER}.\p" .string "Maybe I should go to the BATTLE\n" .string "FRONTIER.\p" .string "Well, anyway, hang in there!$" @@ -579,22 +579,22 @@ LilycoveCity_Text_1E3B2C: @ 81E3B2C .string "I was just talking to myself!$" LilycoveCity_Text_1E3B95: @ 81E3B95 - .string "I’m just a GRUNT, so I don’t know what\n" + .string "I'm just a GRUNT, so I don't know what\n" .string "the BOSS is thinking…\p" - .string "But being on TEAM AQUA, I know I’ll get\n" + .string "But being on TEAM AQUA, I know I'll get\n" .string "the chance to do big things!\p" .string "Wh-who are you?!\n" .string "I was just talking to myself!$" LilycoveCity_Text_1E3C46: @ 81E3C46 .string "Hey, you!\p" - .string "Don’t go near the cave in the cove!\p" - .string "Why? You don’t need a reason why!\n" - .string "I’m an adult, so you just listen to me!$" + .string "Don't go near the cave in the cove!\p" + .string "Why? You don't need a reason why!\n" + .string "I'm an adult, so you just listen to me!$" LilycoveCity_Text_1E3CBE: @ 81E3CBE .string "If this whole wide world becomes ours,\n" - .string "TEAM AQUA’s, it will be a happier\l" + .string "TEAM AQUA's, it will be a happier\l" .string "place for POKéMON, too.$" LilycoveCity_Text_1E3D1F: @ 81E3D1F @@ -603,11 +603,11 @@ LilycoveCity_Text_1E3D1F: @ 81E3D1F LilycoveCity_Text_1E3D4A: @ 81E3D4A .string "Hunh? What do you want?\p" - .string "You’re messing up our training,\n" + .string "You're messing up our training,\n" .string "so can you, like, get lost?$" LilycoveCity_Text_1E3D9E: @ 81E3D9E - .string "There’s a POKéMON CONTEST HALL\n" + .string "There's a POKéMON CONTEST HALL\n" .string "right in this here town. \p" .string "That means well-raised POKéMON will\n" .string "come from all over the country.\p" @@ -618,9 +618,9 @@ LilycoveCity_Text_1E3E3C: @ 81E3E3C .string "the cove at the edge of town?$" LilycoveCity_Text_1E3E7D: @ 81E3E7D - .string "I’m going to teach my POKéMON some new\n" + .string "I'm going to teach my POKéMON some new\n" .string "moves for entering a CONTEST.\p" - .string "So, I’m going to see the MOVE DELETER\n" + .string "So, I'm going to see the MOVE DELETER\n" .string "and make it forget HM moves.$" LilycoveCity_Text_1E3F05: @ 81E3F05 @@ -632,9 +632,9 @@ LilycoveCity_Text_1E3F05: @ 81E3F05 .string "only in this area?$" LilycoveCity_Text_1E3FAB: @ 81E3FAB - .string "TEAM AQUA’s been training their\n" + .string "TEAM AQUA's been training their\n" .string "WAILMER in the cove.\p" - .string "We SAILORS can’t get our boats out\n" + .string "We SAILORS can't get our boats out\n" .string "to sea with them in the way!$" LilycoveCity_Text_1E4020: @ 81E4020 @@ -648,7 +648,7 @@ LilycoveCity_Text_1E40AD: @ 81E40AD .string "I was taking a relaxing snooze at the\n" .string "seaside inn to the sound of waves…\p" .string "When someone stole my POKéMON!\p" - .string "Who’s the abductor?\n" + .string "Who's the abductor?\n" .string "TEAM AQUA? Is it TEAM AQUA?$" LilycoveCity_Text_1E4145: @ 81E4145 @@ -656,10 +656,10 @@ LilycoveCity_Text_1E4145: @ 81E4145 .string "It came back without me noticing!$" LilycoveCity_Text_1E417B: @ 81E417B - .string "I’m an ART DEALER.\p" + .string "I'm an ART DEALER.\p" .string "I am a buyer and seller of fine art,\n" .string "especially paintings.\p" - .string "I’ve heard that the MUSEUM here has\n" + .string "I've heard that the MUSEUM here has\n" .string "magnificent works on exhibit…$" LilycoveCity_Text_1E420B: @ 81E420B @@ -683,12 +683,12 @@ LilycoveCity_Text_1E42FC: @ 81E42FC .string "They call themselves\n" .string "the “nature-loving TEAM AQUA”!\p" .string "But what they do and what they say\n" - .string "don’t match at all!$" + .string "don't match at all!$" LilycoveCity_Text_1E43FF: @ 81E43FF .string "That cave in the cove…\p" - .string "I didn’t notice it right away,\n" - .string "but it’s completely empty now.\p" + .string "I didn't notice it right away,\n" + .string "but it's completely empty now.\p" .string "That TEAM AQUA lot, they must\n" .string "have gone away for good.$" @@ -713,7 +713,7 @@ LilycoveCity_Text_1E4534: @ 81E4534 LilycoveCity_Text_1E4571: @ 81E4571 .string "LILYCOVE MUSEUM\p" - .string "“{PLAYER}’s POKéMON Collection\n" + .string "“{PLAYER}'s POKéMON Collection\n" .string "on exhibit!”$" LilycoveCity_Text_1E45A7: @ 81E45A7 @@ -741,7 +741,7 @@ LilycoveCity_Text_1E46BE: @ 81E46BE .string "you need!”$" LilycoveCity_Text_1E473D: @ 81E473D - .string "MOVE DELETER’S HOUSE\p" + .string "MOVE DELETER'S HOUSE\p" .string "“Unwanted POKéMON moves deleted.”$" LilycoveCity_Text_1E4774: @ 81E4774 @@ -752,18 +752,18 @@ LilycoveCity_Text_1E47A1: @ 81E47A1 .string "People have to work together to get it\n" .string "to spin faster.\p" .string "The faster you can make it spin, the\n" - .string "better {POKEBLOCK}S you can get, I’ve heard.$" + .string "better {POKEBLOCK}S you can get, I've heard.$" LilycoveCity_Text_1E4824: @ 81E4824 - .string "It’s used for making a kind of candy\n" + .string "It's used for making a kind of candy\n" .string "called a {POKEBLOCK}.\p" .string "If you give a good {POKEBLOCK} to a POKéMON,\n" .string "its condition will improve by a lot.$" LilycoveCity_Text_1E48A5: @ 81E48A5 - .string "I heard there’s a tower somewhere out\n" + .string "I heard there's a tower somewhere out\n" .string "on the sea routes.\p" - .string "It’s called the SKY PILLAR, I hear.$" + .string "It's called the SKY PILLAR, I hear.$" LilycoveCity_Text_1E4902: @ 81E4902 .string "I saw this tall tower somewhere\n" diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc index 3f02a404c..f6a53cc5e 100644 --- a/data/maps/LilycoveCity_ContestHall/scripts.inc +++ b/data/maps/LilycoveCity_ContestHall/scripts.inc @@ -2,25 +2,25 @@ LilycoveCity_ContestHall_MapScripts:: @ 821B484 .byte 0 LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485 - msgbox LilycoveCity_ContestHall_Text_21B74E, 2 + msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E - msgbox LilycoveCity_ContestHall_Text_21B7D7, 2 + msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497 - msgbox LilycoveCity_ContestHall_Text_21B899, 2 + msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0 - msgbox LilycoveCity_ContestHall_Text_21B911, 2 + msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC end LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B977, 4 + msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -30,7 +30,7 @@ LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9 LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21B9DC, 4 + msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT closemessage applymovement 5, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -40,7 +40,7 @@ LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0 LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BA44, 4 + msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT closemessage applymovement 6, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -50,7 +50,7 @@ LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7 LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BAD5, 4 + msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -60,7 +60,7 @@ LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BB84, 4 + msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -70,7 +70,7 @@ LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505 LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BBDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT closemessage applymovement 9, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -78,13 +78,13 @@ LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C end LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533 - msgbox LilycoveCity_ContestHall_Text_21BC65, 3 + msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BC89, 4 + msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT closemessage applymovement 12, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -94,7 +94,7 @@ LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD30, 4 + msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT closemessage applymovement 22, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -104,7 +104,7 @@ LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553 LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BD70, 4 + msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -114,7 +114,7 @@ LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BDDD, 4 + msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT closemessage applymovement 13, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -124,7 +124,7 @@ LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581 LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE16, 4 + msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT closemessage applymovement 14, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -134,7 +134,7 @@ LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598 LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BE77, 4 + msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT closemessage applymovement 15, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -144,7 +144,7 @@ LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BEDE, 4 + msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT closemessage applymovement 16, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -154,7 +154,7 @@ LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6 LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BF6E, 4 + msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT closemessage applymovement 17, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -164,7 +164,7 @@ LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21BFE3, 4 + msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT closemessage applymovement 18, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -174,7 +174,7 @@ LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4 LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C07F, 4 + msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT closemessage applymovement 19, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -184,7 +184,7 @@ LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C0D8, 4 + msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT closemessage applymovement 21, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -194,7 +194,7 @@ LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622 LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C137, 4 + msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT closemessage applymovement 20, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -204,7 +204,7 @@ LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639 LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C1A4, 4 + msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT closemessage applymovement 23, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -214,7 +214,7 @@ LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650 LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C215, 4 + msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT closemessage applymovement 24, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -224,7 +224,7 @@ LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667 LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C27F, 4 + msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT closemessage applymovement 25, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -234,7 +234,7 @@ LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C2BB, 4 + msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT closemessage applymovement 26, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -244,7 +244,7 @@ LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695 LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C307, 4 + msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT closemessage applymovement 27, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -254,7 +254,7 @@ LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C365, 4 + msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT closemessage applymovement 28, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -265,19 +265,19 @@ LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA lockall applymovement 29, LilycoveCity_ContestHall_Movement_27259E waitmovement 0 - msgbox LilycoveCity_ContestHall_Text_21C3F4, 4 + msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT closemessage applymovement 29, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 delay 25 - msgbox LilycoveCity_ContestHall_Text_21C411, 4 + msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT releaseall end LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C4B1, 4 + msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT closemessage applymovement 31, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -287,7 +287,7 @@ LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705 LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C lock faceplayer - msgbox LilycoveCity_ContestHall_Text_21C445, 4 + msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT closemessage applymovement 30, LilycoveCity_ContestHall_Movement_2725A2 waitmovement 0 @@ -295,15 +295,15 @@ LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C end LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733 - msgbox LilycoveCity_ContestHall_Text_21C512, 3 + msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C - msgbox LilycoveCity_ContestHall_Text_21C548, 3 + msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN end LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745 - msgbox LilycoveCity_ContestHall_Text_21C57B, 3 + msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN end LilycoveCity_ContestHall_Text_21B74E: @ 821B74E @@ -314,12 +314,12 @@ LilycoveCity_ContestHall_Text_21B74E: @ 821B74E .string "My abilities scare even me…$" LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7 - .string "I’ve entered a bunch of CONTESTS,\n" - .string "so I’m seeing how things work.\p" - .string "If you’re in a COOLNESS CONTEST,\n" + .string "I've entered a bunch of CONTESTS,\n" + .string "so I'm seeing how things work.\p" + .string "If you're in a COOLNESS CONTEST,\n" .string "cool moves go over as appeals.\p" .string "But smart moves and cute moves\n" - .string "don’t go over well, for instance.$" + .string "don't go over well, for instance.$" LilycoveCity_ContestHall_Text_21B899: @ 821B899 .string "That young man who won earlier had\n" @@ -328,15 +328,15 @@ LilycoveCity_ContestHall_Text_21B899: @ 821B899 .string "of those things?$" LilycoveCity_ContestHall_Text_21B911: @ 821B911 - .string "Whoa, isn’t this place humongous!\p" - .string "The tension in the air… It’s not\n" + .string "Whoa, isn't this place humongous!\p" + .string "The tension in the air… It's not\n" .string "like a CONTEST hall in the sticks.$" LilycoveCity_ContestHall_Text_21B977: @ 821B977 .string "MC: Okay, SMART POKéMON and their\n" .string "TRAINERS, are you ready?!\p" .string "Give it your best showing!\n" - .string "Let’s appeal!$" + .string "Let's appeal!$" LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC .string "JUDGE: Are you enjoying this CONTEST?\p" @@ -352,33 +352,33 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44 .string "ROCK SMASH.$" LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5 - .string "I’ve spent many a year, and all my\n" + .string "I've spent many a year, and all my\n" .string "wisdom besides, raising this POKéMON\l" .string "to be smart.\p" - .string "It won’t be easily bested by some\n" - .string "young pup’s POKéMON.\p" + .string "It won't be easily bested by some\n" + .string "young pup's POKéMON.\p" .string "My dear wife, are you seeing this?$" LilycoveCity_ContestHall_Text_21BB84: @ 821BB84 .string "There it is!\p" .string "If my POKéMON pulls a smart move next,\n" - .string "the audience’s excitement will peak!$" + .string "the audience's excitement will peak!$" LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD .string "Oh, dear, no!\p" - .string "My darling ZUBAT’s LEECH LIFE is so\n" + .string "My darling ZUBAT's LEECH LIFE is so\n" .string "cute I kept using it over and over!\p" - .string "But these mean people don’t appreciate\n" + .string "But these mean people don't appreciate\n" .string "it at all!$" LilycoveCity_ContestHall_Text_21BC65: @ 821BC65 - .string "Kiyaaah! You’re beautiful, Grandpa!$" + .string "Kiyaaah! You're beautiful, Grandpa!$" LilycoveCity_ContestHall_Text_21BC89: @ 821BC89 .string "Even when TRAINERS enter the same\n" .string "kind of POKéMON, they all seem to use\l" .string "different moves for appeals.\p" - .string "It’s just like the way people have\n" + .string "It's just like the way people have\n" .string "different styles for battling.$" LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 @@ -386,10 +386,10 @@ LilycoveCity_ContestHall_Text_21BD30: @ 821BD30 .string "than their TRAINERS. By a lot.$" LilycoveCity_ContestHall_Text_21BD70: @ 821BD70 - .string "When all’s said and done, I still love\n" + .string "When all's said and done, I still love\n" .string "SMARTNESS CONTESTS.\p" .string "That intellectual green color…\n" - .string "It’s so… So… Cool.$" + .string "It's so… So… Cool.$" LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD .string "MC: Are you entering the BEAUTY\n" @@ -402,8 +402,8 @@ LilycoveCity_ContestHall_Text_21BE16: @ 821BE16 LilycoveCity_ContestHall_Text_21BE77: @ 821BE77 .string "A POKéMON this beautiful…\n" - .string "There isn’t another one like it.\p" - .string "Everyone’s eyes will be glued to\n" + .string "There isn't another one like it.\p" + .string "Everyone's eyes will be glued to\n" .string "my beauty.$" LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE @@ -411,14 +411,14 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE .string "I brushed and groomed my POKéMON\n" .string "carefully for this CONTEST…\p" .string "But I overdid it…\n" - .string "My POKéMON’s coat turned all scraggly…\p" + .string "My POKéMON's coat turned all scraggly…\p" .string "What should I do?$" LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E .string "This AURORA BEAM is so dazzling,\n" - .string "the JUDGE won’t be able to see it.\p" + .string "the JUDGE won't be able to see it.\p" .string "Uh, wait a second…\n" - .string "That’ll be meaningless, then!$" + .string "That'll be meaningless, then!$" LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3 .string "This pretty POKéMON looks just like\n" @@ -439,14 +439,14 @@ LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8 .string "I just love this sort of glitz!$" LilycoveCity_ContestHall_Text_21C137: @ 821C137 - .string "You can’t always win on just beauty\n" + .string "You can't always win on just beauty\n" .string "alone.\p" .string "You have to groom your POKéMON so\n" - .string "it’s nice and glossy like mine.$" + .string "it's nice and glossy like mine.$" LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4 .string "MC: Uh-oh! Hello!\n" - .string "We’re in the middle of a CONTEST!\p" + .string "We're in the middle of a CONTEST!\p" .string "Please enter at our registration\n" .string "counter and come out, okay?$" @@ -465,16 +465,16 @@ LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB .string "but put it in a CONTEST and look out!$" LilycoveCity_ContestHall_Text_21C307: @ 821C307 - .string "My POKéMON’s PETAL DANCE is a marvel\n" + .string "My POKéMON's PETAL DANCE is a marvel\n" .string "of elegance.\p" - .string "I won’t let anyone disturb its\n" + .string "I won't let anyone disturb its\n" .string "performance.$" LilycoveCity_ContestHall_Text_21C365: @ 821C365 - .string "Everyone’s POKéMON are very cute.\p" + .string "Everyone's POKéMON are very cute.\p" .string "However, if my POKéMON were to make\n" .string "a cute appeal…\p" - .string "I’m sure that it would be so much \n" + .string "I'm sure that it would be so much \n" .string "cuter than the others.$" LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4 @@ -487,13 +487,13 @@ LilycoveCity_ContestHall_Text_21C411: @ 821C411 LilycoveCity_ContestHall_Text_21C445: @ 821C445 .string "I think that girl over there is\n" .string "the cutest of the lot.\p" - .string "What’s that? They’re judging\n" + .string "What's that? They're judging\n" .string "POKéMON by their looks?$" LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1 .string "Ohh, seeing all these cute POKéMON,\n" .string "they make we want to get my own!\p" - .string "I’m going to go catch some!$" + .string "I'm going to go catch some!$" LilycoveCity_ContestHall_Text_21C512: @ 821C512 .string "BEAUTY CONTEST STAGE\n" diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 65749894b..a849925bd 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -39,12 +39,12 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_21A418 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA compare VAR_RESULT, 0 @@ -53,7 +53,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264 end LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 @@ -69,10 +69,10 @@ LilycoveCity_ContestLobby_EventScript_21A2AA:: @ 821A2AA end LilycoveCity_ContestLobby_EventScript_21A2E4:: @ 821A2E4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A2AA - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_21A40F waitmovement 0 @@ -91,12 +91,12 @@ LilycoveCity_ContestLobby_EventScript_21A314:: @ 821A314 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_21A41E waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -214,11 +214,11 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_21A545 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21ADB9, 4 + msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_21AE78, 5 + msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A compare VAR_RESULT, 0 @@ -226,7 +226,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436 end LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A - msgbox LilycoveCity_ContestLobby_Text_21AF63, 4 + msgbox LilycoveCity_ContestLobby_Text_21AF63, MSGBOX_DEFAULT closemessage special sub_80F88DC setvar VAR_0x4099, 0 @@ -242,10 +242,10 @@ LilycoveCity_ContestLobby_EventScript_21A47A:: @ 821A47A end LilycoveCity_ContestLobby_EventScript_21A4B4:: @ 821A4B4 - msgbox LilycoveCity_ContestLobby_Text_21B0BC, 5 + msgbox LilycoveCity_ContestLobby_Text_21B0BC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_ContestLobby_EventScript_21A47A - msgbox LilycoveCity_ContestLobby_Text_21B132, 4 + msgbox LilycoveCity_ContestLobby_Text_21B132, MSGBOX_DEFAULT closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_21A53C waitmovement 0 @@ -265,12 +265,12 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_21A54B waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_21B030, 4 + msgbox LilycoveCity_ContestLobby_Text_21B030, MSGBOX_DEFAULT playfanfare MUS_FANFA4 - msgbox LilycoveCity_ContestLobby_Text_21B07E, 4 + msgbox LilycoveCity_ContestLobby_Text_21B07E, MSGBOX_DEFAULT waitfanfare - msgbox LilycoveCity_ContestLobby_Text_21B094, 4 - msgbox LilycoveCity_ContestLobby_Text_21B0AD, 4 + msgbox LilycoveCity_ContestLobby_Text_21B094, MSGBOX_DEFAULT + msgbox LilycoveCity_ContestLobby_Text_21B0AD, MSGBOX_DEFAULT closemessage return @@ -424,7 +424,7 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 waitmovement 0 applymovement 255, LilycoveCity_ContestLobby_Movement_21A6F2 waitmovement 0 - msgbox LilycoveCity_ContestLobby_Text_27B653, 4 + msgbox LilycoveCity_ContestLobby_Text_27B653, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_21A6FD applymovement 255, LilycoveCity_ContestLobby_Movement_21A6E8 @@ -477,27 +477,27 @@ LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 - msgbox LilycoveCity_ContestLobby_Text_21B1B1, 2 + msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711 - msgbox LilycoveCity_ContestLobby_Text_21B24D, 2 + msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A - msgbox LilycoveCity_ContestLobby_Text_21B2BA, 2 + msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723 - msgbox LilycoveCity_ContestLobby_Text_21B334, 2 + msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C - msgbox LilycoveCity_ContestLobby_Text_21B392, 2 + msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735 - msgbox LilycoveCity_ContestLobby_Text_21B3FC, 2 + msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E @@ -543,11 +543,11 @@ LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761 end LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768 - msgbox LilycoveCity_ContestLobby_Text_2931AA, 2 + msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771 - msgbox LilycoveCity_ContestLobby_Text_2931C6, 2 + msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC end LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A @@ -571,46 +571,46 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784 LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C427C, 4 + msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8 lock - msgbox LilycoveCity_ContestLobby_Text_2C464B, 4 + msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3 lock - msgbox LilycoveCity_ContestLobby_Text_2C465A, 4 + msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE lock - msgbox LilycoveCity_ContestLobby_Text_2C4669, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4679, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C46B1, 4 + msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_2C4763, 4 + msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A7F9 end @@ -625,7 +625,7 @@ LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806 special sub_80F9154 lock faceplayer - msgbox LilycoveCity_ContestLobby_Text_27C063, 4 + msgbox LilycoveCity_ContestLobby_Text_27C063, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A819 end @@ -641,7 +641,7 @@ LilycoveCity_ContestLobby_EventScript_21A819:: @ 821A819 end LilycoveCity_ContestLobby_EventScript_21A856:: @ 821A856 - msgbox LilycoveCity_ContestLobby_Text_27BD17, 5 + msgbox LilycoveCity_ContestLobby_Text_27BD17, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_ContestLobby_EventScript_21A97F call LilycoveCity_ContestLobby_EventScript_27134F @@ -694,28 +694,28 @@ LilycoveCity_ContestLobby_EventScript_21A90D:: @ 821A90D end LilycoveCity_ContestLobby_EventScript_21A955:: @ 821A955 - msgbox LilycoveCity_ContestLobby_Text_27C340, 4 + msgbox LilycoveCity_ContestLobby_Text_27C340, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A963:: @ 821A963 - msgbox LilycoveCity_ContestLobby_Text_27C5B1, 4 + msgbox LilycoveCity_ContestLobby_Text_27C5B1, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A971:: @ 821A971 - msgbox LilycoveCity_ContestLobby_Text_27C742, 4 + msgbox LilycoveCity_ContestLobby_Text_27C742, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A90D end LilycoveCity_ContestLobby_EventScript_21A97F:: @ 821A97F special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27BD4F, 4 + msgbox LilycoveCity_ContestLobby_Text_27BD4F, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C - msgbox LilycoveCity_ContestLobby_Text_27C1C3, 4 + msgbox LilycoveCity_ContestLobby_Text_27C1C3, MSGBOX_DEFAULT setvar VAR_CONTEST_RANK, 0 choosecontestmon compare VAR_0x8004, 255 @@ -734,17 +734,17 @@ LilycoveCity_ContestLobby_EventScript_21A98C:: @ 821A98C end LilycoveCity_ContestLobby_EventScript_21A9E0:: @ 821A9E0 - msgbox LilycoveCity_ContestLobby_Text_27B471, 4 + msgbox LilycoveCity_ContestLobby_Text_27B471, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9EE:: @ 821A9EE - msgbox LilycoveCity_ContestLobby_Text_27C186, 4 + msgbox LilycoveCity_ContestLobby_Text_27C186, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end LilycoveCity_ContestLobby_EventScript_21A9FC:: @ 821A9FC - msgbox LilycoveCity_ContestLobby_Text_27C140, 4 + msgbox LilycoveCity_ContestLobby_Text_27C140, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A98C end @@ -796,34 +796,34 @@ LilycoveCity_ContestLobby_EventScript_21AAC0:: @ 821AAC0 return LilycoveCity_ContestLobby_EventScript_21AAC5:: @ 821AAC5 - msgbox LilycoveCity_ContestLobby_Text_27BF0E, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF0E, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAD3:: @ 821AAD3 - msgbox LilycoveCity_ContestLobby_Text_27BF4B, 4 + msgbox LilycoveCity_ContestLobby_Text_27BF4B, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAE1:: @ 821AAE1 - msgbox LilycoveCity_ContestLobby_Text_27C254, 4 + msgbox LilycoveCity_ContestLobby_Text_27C254, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end LilycoveCity_ContestLobby_EventScript_21AAEF:: @ 821AAEF special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27821C, 4 + msgbox LilycoveCity_ContestLobby_Text_27821C, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AAFC:: @ 821AAFC special CloseLink - msgbox LilycoveCity_ContestLobby_Text_27C879, 4 + msgbox LilycoveCity_ContestLobby_Text_27C879, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AB09:: @ 821AB09 - msgbox LilycoveCity_ContestLobby_Text_27BEFA, 4 + msgbox LilycoveCity_ContestLobby_Text_27BEFA, MSGBOX_DEFAULT goto LilycoveCity_ContestLobby_EventScript_21A97F end @@ -1008,12 +1008,12 @@ LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 faceplayer checkflag FLAG_0x05F goto_eq LilycoveCity_ContestLobby_EventScript_21AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD10, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end LilycoveCity_ContestLobby_EventScript_21AD06:: @ 821AD06 - msgbox LilycoveCity_ContestLobby_Text_21AD55, 4 + msgbox LilycoveCity_ContestLobby_Text_21AD55, MSGBOX_DEFAULT release end @@ -1031,15 +1031,15 @@ LilycoveCity_ContestLobby_Text_21ADB9: @ 821ADB9 .string "Congratulations!\p" .string "I did a painting of your POKéMON to\n" .string "commemorate its victory…\p" - .string "Well, your POKéMON’s appeals were\n" + .string "Well, your POKéMON's appeals were\n" .string "so fantastic, it spurred me into\l" .string "painting better than I usually do.\l" .string "Look, see?$" LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 - .string "What do you think? I’m confident in\n" - .string "what I’ve done, but do you like it?\p" - .string "A work of this caliber, it wouldn’t look\n" + .string "What do you think? I'm confident in\n" + .string "what I've done, but do you like it?\p" + .string "A work of this caliber, it wouldn't look\n" .string "out of place in an art museum.\p" .string "Huh? An art museum really is looking\n" .string "for paintings?\p" @@ -1048,14 +1048,14 @@ LilycoveCity_ContestLobby_Text_21AE78: @ 821AE78 LilycoveCity_ContestLobby_Text_21AF63: @ 821AF63 .string "What, really? Then, sure, I will take\n" .string "this painting there right now.\p" - .string "I’ll give it a proper title, too.\p" - .string "I hope they’ll like it and consider\n" + .string "I'll give it a proper title, too.\p" + .string "I hope they'll like it and consider\n" .string "exhibiting this.\p" .string "Please check if they did accept this.\n" .string "Thank you!$" LilycoveCity_ContestLobby_Text_21B030: @ 821B030 - .string "Oh, that’s right!\p" + .string "Oh, that's right!\p" .string "As a memento of me painting your\n" .string "POKéMON, please take this.$" @@ -1070,15 +1070,15 @@ LilycoveCity_ContestLobby_Text_21B0AD: @ 821B0AD .string "Okay, see you!$" LilycoveCity_ContestLobby_Text_21B0BC: @ 821B0BC - .string "Oh… Then, I guess I’ll just take\n" + .string "Oh… Then, I guess I'll just take\n" .string "this home with me…\p" .string "But, you know, I would like to take\n" .string "this to the art museum… Okay?$" LilycoveCity_ContestLobby_Text_21B132: @ 821B132 - .string "Oh, fine, that’s the way it is.\n" + .string "Oh, fine, that's the way it is.\n" .string "I will hang this in my own house.\p" - .string "I’ll just have to try harder next time.\n" + .string "I'll just have to try harder next time.\n" .string "Well, be seeing you.$" LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 @@ -1092,7 +1092,7 @@ LilycoveCity_ContestLobby_Text_21B1B1: @ 821B1B1 LilycoveCity_ContestLobby_Text_21B24D: @ 821B24D .string "You can see a whole variety of\n" .string "POKéMON here.\p" - .string "That’s why I make this place a regular\n" + .string "That's why I make this place a regular\n" .string "part of my daily stroll.$" LilycoveCity_ContestLobby_Text_21B2BA: @ 821B2BA diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc index 3468299a9..18ef70cfd 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc @@ -7,10 +7,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218264, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21831E, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -18,10 +18,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218189:: @ 8218189 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2183C3, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218470, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -29,10 +29,10 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_2181C3:: @ 82181C3 end LilycoveCity_CoveLilyMotel_1F_EventScript_2181EA:: @ 82181EA - msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_218544, MSGBOX_DEFAULT applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_2185F4, MSGBOX_DEFAULT closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_2725A2 waitmovement 0 @@ -48,7 +48,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 waitmovement 0 applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, 4 + msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT closemessage applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_218259 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_21825E @@ -79,7 +79,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 .string "Hm, so they doubled the guests by\n" .string "using POKéMON as attractions?\p" .string "Hm, well, maybe I should make a cute\n" - .string "POKéMON our inn’s mascot.\p" + .string "POKéMON our inn's mascot.\p" .string "I wonder if that will attract more\n" .string "guests to stay with us?$" @@ -91,12 +91,12 @@ LilycoveCity_CoveLilyMotel_1F_Text_21831E: @ 821831E LilycoveCity_CoveLilyMotel_1F_Text_21839B: @ 821839B .string "Hey, down in front!\n" - .string "I can’t see the TV!$" + .string "I can't see the TV!$" LilycoveCity_CoveLilyMotel_1F_Text_2183C3: @ 82183C3 - .string "Amazing! You’re telling me a POKéMON\n" - .string "found someone’s lost item?\p" - .string "That’s something. If we had some smart\n" + .string "Amazing! You're telling me a POKéMON\n" + .string "found someone's lost item?\p" + .string "That's something. If we had some smart\n" .string "POKéMON like that…\p" .string "We could recover anything that our\n" .string "guests mislaid…$" @@ -114,7 +114,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_218470: @ 8218470 LilycoveCity_CoveLilyMotel_1F_Text_218544: @ 8218544 .string "Amazing! A house-sitting POKéMON\n" .string "caught a burglar?\p" - .string "That’s something. If we had a tough\n" + .string "That's something. If we had a tough\n" .string "POKéMON as a security guard…\p" .string "We would be able to provide our guests\n" .string "with greater safety.$" @@ -126,6 +126,6 @@ LilycoveCity_CoveLilyMotel_1F_Text_2185F4: @ 82185F4 .string "a little while ago.\p" .string "They booked in as GAME FREAK,\n" .string "so I guess they must make games.\p" - .string "Uh-oh, I’d better get working on\n" + .string "Uh-oh, I'd better get working on\n" .string "their dinner!$" diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index d77627bc3..33f67ff9a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -15,7 +15,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3:: @ 82186D3 end LilycoveCity_CoveLilyMotel_2F_EventScript_2186F9:: @ 82186F9 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218774, MSGBOX_DEFAULT return LilycoveCity_CoveLilyMotel_2F_EventScript_218702:: @ 8218702 @@ -35,23 +35,23 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21870F:: @ 821870F end LilycoveCity_CoveLilyMotel_2F_EventScript_218720:: @ 8218720 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_2188D6, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218729:: @ 8218729 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21892B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218732:: @ 8218732 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_21896C, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21873B:: @ 821873B - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A21, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, 2 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218A5B, MSGBOX_NPC end LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D @@ -59,52 +59,52 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D faceplayer checkflag FLAG_0x1CE goto_eq LilycoveCity_CoveLilyMotel_2F_EventScript_21876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CE release end LilycoveCity_CoveLilyMotel_2F_EventScript_21876A:: @ 821876A - msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, 4 + msgbox LilycoveCity_CoveLilyMotel_2F_Text_218C33, MSGBOX_DEFAULT release end LilycoveCity_CoveLilyMotel_2F_Text_218774: @ 8218774 - .string "I’m the GAME DESIGNER.\p" + .string "I'm the GAME DESIGNER.\p" .string "Oh, is that right?\n" - .string "You’re working on a POKéDEX?\p" - .string "It’s tough trying to complete it,\n" - .string "but don’t give up.\p" + .string "You're working on a POKéDEX?\p" + .string "It's tough trying to complete it,\n" + .string "but don't give up.\p" .string "If you do complete it, please come\n" .string "show me.$" LilycoveCity_CoveLilyMotel_2F_Text_21881C: @ 821881C - .string "Wow! That’s awesome!\n" - .string "Yep, it’s totally awesome!\p" + .string "Wow! That's awesome!\n" + .string "Yep, it's totally awesome!\p" .string "This POKéDEX is completely filled!\n" .string "You really must love POKéMON!\p" - .string "I’m so impressed!\p" + .string "I'm so impressed!\p" .string "Let me give you something in\n" .string "recognition of your feat!$" LilycoveCity_CoveLilyMotel_2F_Text_2188D6: @ 82188D6 - .string "Me? You’re talking to me?\n" - .string "I’m the PROGRAMMER.\p" + .string "Me? You're talking to me?\n" + .string "I'm the PROGRAMMER.\p" .string "I wonder what the SLOTS are\n" .string "like here.$" LilycoveCity_CoveLilyMotel_2F_Text_21892B: @ 821892B - .string "I’m the GRAPHIC ARTIST! Aren’t the\n" + .string "I'm the GRAPHIC ARTIST! Aren't the\n" .string "POKéMON of HOENN interesting?$" LilycoveCity_CoveLilyMotel_2F_Text_21896C: @ 821896C - .string "The girl TUBERS, they’re cute, hey?\n" + .string "The girl TUBERS, they're cute, hey?\n" .string "To battle against a cute TUBER…\p" - .string "Whoop, it’s so awesome!\p" - .string "And the TWINS! Aren’t they cute?\n" + .string "Whoop, it's so awesome!\p" + .string "And the TWINS! Aren't they cute?\n" .string "A 2-on-2 battle with TWINS…\p" - .string "Whoop, it’s unbearably fun!$" + .string "Whoop, it's unbearably fun!$" LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 .string "The sea breeze tickles my heart.\n" @@ -113,7 +113,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_218A21: @ 8218A21 LilycoveCity_CoveLilyMotel_2F_Text_218A5B: @ 8218A5B .string "You never know when and where\n" .string "people will challenge you.\p" - .string "That’s why I never leave home without\n" + .string "That's why I never leave home without\n" .string "my GAME BOY ADVANCE.$" LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF @@ -127,8 +127,8 @@ LilycoveCity_CoveLilyMotel_2F_Text_218ACF: @ 8218ACF .string "entertaining, but…\p" .string "Consider me a purist--I prefer\n" .string "battles and tough TRAINERS.\p" - .string "But that’s just me.\p" - .string "{PLAYER}{KUN}, I hope you’ll enjoy everything\n" + .string "But that's just me.\p" + .string "{PLAYER}{KUN}, I hope you'll enjoy everything\n" .string "like the GYMS, CONTESTS, BATTLE TENT,\l" .string "the whole works!$" @@ -136,5 +136,5 @@ LilycoveCity_CoveLilyMotel_2F_Text_218C33: @ 8218C33 .string "SCOTT: I think it does take strategy\n" .string "to win a CONTEST.\p" .string "Devising CONTEST strategies is one way\n" - .string "of becoming a better TRAINER, I’d say.$" + .string "of becoming a better TRAINER, I'd say.$" diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 9a4a5aead..dbb552409 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -24,7 +24,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F message gUnknown_08272A21 waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -54,17 +54,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 getpricereduction 3 compare VAR_RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_220282:: @ 8220282 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2204C9, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStoreRooftop_EventScript_22028C:: @ 822028C - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, 2 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220552, MSGBOX_NPC end LilycoveCity_DepartmentStoreRooftop_EventScript_220295:: @ 8220295 @@ -82,7 +82,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2202A6:: @ 82202A6 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2202E4 case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_2202EF case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_2202FA - msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_220603, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end @@ -147,11 +147,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F nop bufferitemname 0, VAR_TEMP_0 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -159,11 +159,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_220436 @@ -171,11 +171,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220450 playse SE_JIHANKI - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205C2, MSGBOX_DEFAULT giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox gUnknown_08272A9A, 4 + msgbox gUnknown_08272A9A, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_220436 end @@ -186,12 +186,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220436:: @ 8220436 end LilycoveCity_DepartmentStoreRooftop_EventScript_220442:: @ 8220442 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, 4 + msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205F1, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_22045E end @@ -203,22 +203,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E end LilycoveCity_DepartmentStoreRooftop_Text_220463: @ 8220463 - .string "Don’t they have set dates for their\n" + .string "Don't they have set dates for their\n" .string "clear-out sales?\p" .string "I watch TV, but they never show any\n" .string "commercials.$" LilycoveCity_DepartmentStoreRooftop_Text_2204C9: @ 82204C9 - .string "Yes! I’ve been waiting a long time for\n" + .string "Yes! I've been waiting a long time for\n" .string "this clear-out sale.\p" .string "They have items that you can only get\n" - .string "here. I’m going to load up, that I am!$" + .string "here. I'm going to load up, that I am!$" LilycoveCity_DepartmentStoreRooftop_Text_220552: @ 8220552 - .string "Ohh… I’m bone-dry thirsty!$" + .string "Ohh… I'm bone-dry thirsty!$" LilycoveCity_DepartmentStoreRooftop_Text_22056D: @ 822056D - .string "It’s a VENDING MACHINE.\n" + .string "It's a VENDING MACHINE.\n" .string "Which drink would you like?$" LilycoveCity_DepartmentStoreRooftop_Text_2205A1: @ 82205A1 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index 4a375cf5e..fece7f16e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692 .byte 0 LilycoveCity_DepartmentStore_1F_EventScript_21F693:: @ 821F693 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F866, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 checkflag FLAG_0x92A goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, 5 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 setflag FLAG_0x92A @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C special RetrieveLotteryNumber copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber - msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_2725A8 waitmovement 0 playse SE_PC_ON @@ -57,47 +57,47 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C end LilycoveCity_DepartmentStore_1F_EventScript_21F77B:: @ 821F77B - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6592, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F784:: @ 821F784 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A65E6, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F78D:: @ 821F78D - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6496, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F797:: @ 821F797 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A64B1, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7A1:: @ 821F7A1 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A663C, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStore_1F_EventScript_21F7AF end LilycoveCity_DepartmentStore_1F_EventScript_21F7AF:: @ 821F7AF - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6831, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7B9:: @ 821F7B9 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6664, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7C2:: @ 821F7C2 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66A7, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7CB:: @ 821F7CB - msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A66ED, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7D4:: @ 821F7D4 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A6731, MSGBOX_DEFAULT return LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD @@ -107,12 +107,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7DD:: @ 821F7DD end LilycoveCity_DepartmentStore_1F_EventScript_21F7ED:: @ 821F7ED - msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A678C, MSGBOX_DEFAULT release end LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 - msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_2A67E1, MSGBOX_DEFAULT giveitem_std VAR_POKELOT_PRIZE compare VAR_RESULT, 0 goto_eq LilycoveCity_DepartmentStore_1F_EventScript_21F7ED @@ -125,15 +125,15 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F7F7:: @ 821F7F7 end LilycoveCity_DepartmentStore_1F_EventScript_21F82F:: @ 821F82F - msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F88C, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F838:: @ 821F838 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F8F5, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F841:: @ 821F841 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, 2 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F92B, MSGBOX_NPC end LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A @@ -141,13 +141,13 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F84A:: @ 821F84A faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, 4 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F974, MSGBOX_DEFAULT waitmoncry release end LilycoveCity_DepartmentStore_1F_EventScript_21F85D:: @ 821F85D - msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, 3 + msgbox LilycoveCity_DepartmentStore_1F_Text_21F98A, MSGBOX_SIGN end LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 @@ -156,14 +156,14 @@ LilycoveCity_DepartmentStore_1F_Text_21F866: @ 821F866 LilycoveCity_DepartmentStore_1F_Text_21F88C: @ 821F88C .string "Whenever I come to the DEPARTMENT\n" .string "STORE, I always end up buying all sorts\l" - .string "of things because it’s so fun.$" + .string "of things because it's so fun.$" LilycoveCity_DepartmentStore_1F_Text_21F8F5: @ 821F8F5 .string "Today, my mom is going to buy me some\n" .string "nice furniture.$" LilycoveCity_DepartmentStore_1F_Text_21F92B: @ 821F92B - .string "I’m buying something for my AZUMARILL\n" + .string "I'm buying something for my AZUMARILL\n" .string "as a reward for winning a CONTEST.$" LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 @@ -172,7 +172,7 @@ LilycoveCity_DepartmentStore_1F_Text_21F974: @ 821F974 LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A .string "1F: SERVICE COUNTER\n" .string " LOTTERY CORNER\p" - .string "2F: TRAINER’S ZONE\p" + .string "2F: TRAINER'S ZONE\p" .string "3F: BATTLE COLLECTION\p" .string "4F: TM CORNER\p" .string "5F: POKé DOLL FLOOR\p" @@ -180,12 +180,12 @@ LilycoveCity_DepartmentStore_1F_Text_21F98A: @ 821F98A LilycoveCity_DepartmentStore_1F_Text_21FA13: @ 821FA13 .string "Wireless Communication is a\n" - .string "lot of fun, isn’t it?\p" + .string "lot of fun, isn't it?\p" .string "I think it lets you do things that\n" - .string "weren’t possible before.\p" + .string "weren't possible before.\p" .string "For instance, you can now trade\n" - .string "with people you couldn’t before.\p" - .string "I think it’s going to be exciting!$" + .string "with people you couldn't before.\p" + .string "I think it's going to be exciting!$" LilycoveCity_DepartmentStore_1F_Text_21FAE5: @ 821FAE5 .string "I want to spread the word about how\n" diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 8bc6d8b29..4d4edf373 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C .byte 0 LilycoveCity_DepartmentStore_2F_EventScript_21FB2D:: @ 821FB2D - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBAC, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB36:: @ 821FB36 - msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FBDF, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB3F:: @ 821FB3F - msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, 2 + msgbox LilycoveCity_DepartmentStore_2F_Text_21FC23, MSGBOX_NPC end LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB48:: @ 821FB48 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,7 +46,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_21FB7A:: @ 821FB7A message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_2F_Pokemart_21FB94 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -68,13 +68,13 @@ LilycoveCity_DepartmentStore_2F_Pokemart_21FB94: @ 821FB94 LilycoveCity_DepartmentStore_2F_Text_21FBAC: @ 821FBAC .string "Learn to use items properly.\n" - .string "That’s basic, really.$" + .string "That's basic, really.$" LilycoveCity_DepartmentStore_2F_Text_21FBDF: @ 821FBDF .string "My husband is waiting at home.\n" .string "What would make a good gift for him?$" LilycoveCity_DepartmentStore_2F_Text_21FC23: @ 821FC23 - .string "I’m leaving on a long journey soon.\n" + .string "I'm leaving on a long journey soon.\n" .string "I need to stock up on items.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index 1d980f83e..053ff4632 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC65:: @ 821FC65 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FC7C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -28,7 +28,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_21FC8C:: @ 821FC8C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -46,15 +46,15 @@ LilycoveCity_DepartmentStore_3F_Pokemart_21FCA4: @ 821FCA4 end LilycoveCity_DepartmentStore_3F_EventScript_21FCB6:: @ 821FCB6 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FCD1, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCBF:: @ 821FCBF - msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FD3B, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_EventScript_21FCC8:: @ 821FCC8 - msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, 2 + msgbox LilycoveCity_DepartmentStore_3F_Text_21FDB4, MSGBOX_NPC end LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 @@ -66,7 +66,7 @@ LilycoveCity_DepartmentStore_3F_Text_21FCD1: @ 821FCD1 LilycoveCity_DepartmentStore_3F_Text_21FD3B: @ 821FD3B .string "I want my POKéMON to have more\n" .string "endurance.\p" - .string "I’m trying to decide whether to raise\n" + .string "I'm trying to decide whether to raise\n" .string "DEFENSE with IRON, or SP. DEF with ZINC.$" LilycoveCity_DepartmentStore_3F_Text_21FDB4: @ 821FDB4 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index b162c4740..d78baaf3d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -2,15 +2,15 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA .byte 0 LilycoveCity_DepartmentStore_4F_EventScript_21FDEB:: @ 821FDEB - msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FE50, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDF4:: @ 821FDF4 - msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FEC7, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FDFD:: @ 821FDFD - msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, 2 + msgbox LilycoveCity_DepartmentStore_4F_Text_21FF2D, MSGBOX_NPC end LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE06:: @ 821FE06 message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE20 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_21FE2C:: @ 821FE2C message gUnknown_08272A21 waitmessage pokemart LilycoveCity_DepartmentStore_4F_Pokemart_21FE44 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStore_4F_Text_21FE50: @ 821FE50 .string "Hmm…\p" .string "An attacking move…\n" .string "Or a defensive move…\p" - .string "It’s no easy matter to decide which TM\n" + .string "It's no easy matter to decide which TM\n" .string "moves should be taught to POKéMON…$" LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 @@ -67,6 +67,6 @@ LilycoveCity_DepartmentStore_4F_Text_21FEC7: @ 821FEC7 .string "different kinds.$" LilycoveCity_DepartmentStore_4F_Text_21FF2D: @ 821FF2D - .string "I’d like to get all the different TMs,\n" + .string "I'd like to get all the different TMs,\n" .string "but a POKéMON learns only four moves.$" diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index d5f5e49ad..9f55dbc04 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -19,7 +19,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -47,7 +47,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -72,7 +72,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -97,7 +97,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A message gUnknown_08272A21 waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -118,7 +118,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 end LilycoveCity_DepartmentStore_5F_EventScript_22006C:: @ 822006C - msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_2200C5, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 @@ -133,13 +133,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_220075:: @ 8220075 end LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C - msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_22016B, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 - msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, 4 + msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT closemessage applymovement 7, LilycoveCity_DepartmentStore_5F_Movement_2725A6 waitmovement 0 @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 end LilycoveCity_DepartmentStore_5F_EventScript_2200BC:: @ 82200BC - msgbox LilycoveCity_DepartmentStore_5F_Text_220122, 2 + msgbox LilycoveCity_DepartmentStore_5F_Text_220122, MSGBOX_NPC end LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 @@ -156,13 +156,13 @@ LilycoveCity_DepartmentStore_5F_Text_2200C5: @ 82200C5 .string "just for my children.$" LilycoveCity_DepartmentStore_5F_Text_220122: @ 8220122 - .string "I’m not big enough to raise POKéMON,\n" - .string "so I’m getting a cute DOLL instead.$" + .string "I'm not big enough to raise POKéMON,\n" + .string "so I'm getting a cute DOLL instead.$" LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B .string "They sell many cute MATS here.\p" .string "I wonder which one I should get?\n" - .string "Maybe I’ll buy them all…$" + .string "Maybe I'll buy them all…$" LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 .string "I think they closed the rooftop\n" diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 99ad20280..67ef01e09 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -35,7 +35,7 @@ LilycoveCity_Harbor_EventScript_21E00F:: @ 821E00F LilycoveCity_Harbor_EventScript_21E080:: @ 821E080 compare VAR_TEMP_A, 0 goto_eq LilycoveCity_Harbor_EventScript_21E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_21E139:: @ 821E139 end LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -97,7 +97,7 @@ LilycoveCity_Harbor_EventScript_21E149:: @ 821E149 end LilycoveCity_Harbor_EventScript_21E171:: @ 821E171 - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -216,10 +216,10 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 setflag FLAG_0x1AE - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2A68FC, 4 + msgbox LilycoveCity_Harbor_Text_2A68FC, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E30F end @@ -233,10 +233,10 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 setflag FLAG_0x1AF - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E33F end @@ -250,10 +250,10 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 setflag FLAG_0x1B0 - msgbox LilycoveCity_Harbor_Text_2A6848, 4 + msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C68A5, 4 + msgbox LilycoveCity_Harbor_Text_2C68A5, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -271,12 +271,12 @@ LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 call_if 1, LilycoveCity_Harbor_EventScript_21E675 compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E680 - msgbox LilycoveCity_Harbor_Text_2C6951, 4 + msgbox LilycoveCity_Harbor_Text_2C6951, MSGBOX_DEFAULT compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E68B compare VAR_FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_21E696 - msgbox LilycoveCity_Harbor_Text_2C69AA, 4 + msgbox LilycoveCity_Harbor_Text_2C69AA, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_21E6A1 @@ -299,10 +299,10 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D setflag FLAG_0x1DB - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE - msgbox LilycoveCity_Harbor_Text_2C6A71, 4 + msgbox LilycoveCity_Harbor_Text_2C6A71, MSGBOX_DEFAULT goto LilycoveCity_Harbor_EventScript_21E43C end @@ -315,7 +315,7 @@ LilycoveCity_Harbor_EventScript_21E43C:: @ 821E43C end LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D - msgbox LilycoveCity_Harbor_Text_2A68D2, 4 + msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE message LilycoveCity_Harbor_Text_2C6BD4 @@ -335,7 +335,7 @@ LilycoveCity_Harbor_EventScript_21E44D:: @ 821E44D end LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 - msgbox LilycoveCity_Harbor_Text_2A6A82, 4 + msgbox LilycoveCity_Harbor_Text_2A6A82, MSGBOX_DEFAULT closemessage applymovement 4, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -346,7 +346,7 @@ LilycoveCity_Harbor_EventScript_21E4B6:: @ 821E4B6 waitmovement 0 showobjectat 1, MAP_LILYCOVE_CITY_HARBOR delay 30 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -378,24 +378,24 @@ LilycoveCity_Harbor_EventScript_21E514:: @ 821E514 return LilycoveCity_Harbor_EventScript_21E54D:: @ 821E54D - msgbox LilycoveCity_Harbor_Text_21E6F1, 4 + msgbox LilycoveCity_Harbor_Text_21E6F1, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E557:: @ 821E557 - msgbox LilycoveCity_Harbor_Text_21E758, 4 + msgbox LilycoveCity_Harbor_Text_21E758, MSGBOX_DEFAULT message LilycoveCity_Harbor_Text_21E7ED waitmessage goto LilycoveCity_Harbor_EventScript_21E09F end LilycoveCity_Harbor_EventScript_21E56B:: @ 821E56B - msgbox LilycoveCity_Harbor_Text_21E792, 4 + msgbox LilycoveCity_Harbor_Text_21E792, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 - msgbox LilycoveCity_Harbor_Text_21E864, 5 + msgbox LilycoveCity_Harbor_Text_21E864, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 setvar VAR_PORTHOLE_STATE, 5 @@ -406,7 +406,7 @@ LilycoveCity_Harbor_EventScript_21E575:: @ 821E575 end LilycoveCity_Harbor_EventScript_21E59D:: @ 821E59D - msgbox LilycoveCity_Harbor_Text_21E880, 5 + msgbox LilycoveCity_Harbor_Text_21E880, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_Harbor_EventScript_21E5C0 call LilycoveCity_Harbor_EventScript_21E5CC @@ -422,7 +422,7 @@ LilycoveCity_Harbor_EventScript_21E5C0:: @ 821E5C0 end LilycoveCity_Harbor_EventScript_21E5CC:: @ 821E5CC - msgbox LilycoveCity_Harbor_Text_21E89D, 4 + msgbox LilycoveCity_Harbor_Text_21E89D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_2725A6 waitmovement 0 @@ -449,7 +449,7 @@ LilycoveCity_Harbor_EventScript_21E61B:: @ 821E61B return LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 - msgbox LilycoveCity_Harbor_Text_21E842, 4 + msgbox LilycoveCity_Harbor_Text_21E842, MSGBOX_DEFAULT release end @@ -471,12 +471,12 @@ LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq LilycoveCity_Harbor_EventScript_21E64C - msgbox LilycoveCity_Harbor_Text_21E8EE, 4 + msgbox LilycoveCity_Harbor_Text_21E8EE, MSGBOX_DEFAULT release end LilycoveCity_Harbor_EventScript_21E64C:: @ 821E64C - msgbox LilycoveCity_Harbor_Text_21E976, 4 + msgbox LilycoveCity_Harbor_Text_21E976, MSGBOX_DEFAULT release end @@ -579,8 +579,8 @@ LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" + .string "You're looking for a ship?\p" + .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" LilycoveCity_Harbor_Text_21E758: @ 821E758 @@ -589,14 +589,14 @@ LilycoveCity_Harbor_Text_21E758: @ 821E758 LilycoveCity_Harbor_Text_21E792: @ 821E792 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" LilycoveCity_Harbor_Text_21E7ED: @ 821E7ED .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" LilycoveCity_Harbor_Text_21E842: @ 821E842 @@ -618,13 +618,13 @@ LilycoveCity_Harbor_Text_21E8CC: @ 821E8CC LilycoveCity_Harbor_Text_21E8EE: @ 821E8EE .string "Until they finish making the ferry,\n" .string "we sailors have nothing to do…\p" - .string "I wish they’d get a move on, the folks\n" + .string "I wish they'd get a move on, the folks\n" .string "at the SHIPYARD in SLATEPORT.$" LilycoveCity_Harbor_Text_21E976: @ 821E976 .string "The ferry S.S. TIDAL is finally in\n" .string "operation.\p" .string "The folks at the SHIPYARD in SLATEPORT\n" - .string "must’ve worked extra hard.\p" - .string "Well, it’s my turn to get busy now!$" + .string "must've worked extra hard.\p" + .string "Well, it's my turn to get busy now!$" diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc index 59418e667..ce09fa3dc 100644 --- a/data/maps/LilycoveCity_House1/scripts.inc +++ b/data/maps/LilycoveCity_House1/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_House1_MapScripts:: @ 821ECCD .byte 0 LilycoveCity_House1_EventScript_21ECCE:: @ 821ECCE - msgbox LilycoveCity_House1_Text_21ECEA, 2 + msgbox LilycoveCity_House1_Text_21ECEA, MSGBOX_NPC end LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 @@ -10,14 +10,14 @@ LilycoveCity_House1_EventScript_21ECD7:: @ 821ECD7 faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox LilycoveCity_House1_Text_21ED63, 4 + msgbox LilycoveCity_House1_Text_21ED63, MSGBOX_DEFAULT waitmoncry release end LilycoveCity_House1_Text_21ECEA: @ 821ECEA .string "POKéMON are partners to people.\n" - .string "They aren’t our tools.\p" + .string "They aren't our tools.\p" .string "Unfortunately, there are some people\n" .string "who fail to understand that…$" diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 486df9be0..6069f0fa7 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -6,23 +6,23 @@ LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 faceplayer checkflag FLAG_0x0EA goto_eq LilycoveCity_House2_EventScript_21EDAC - msgbox LilycoveCity_House2_Text_21EDB6, 4 + msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 goto_eq LilycoveCity_House2_EventScript_272054 setflag FLAG_0x0EA - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end LilycoveCity_House2_EventScript_21EDAC:: @ 821EDAC - msgbox LilycoveCity_House2_Text_21EDF9, 4 + msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end LilycoveCity_House2_Text_21EDB6: @ 821EDB6 - .string "Huh? What? What’s that?\p" - .string "I’m not near awake yet…\n" + .string "Huh? What? What's that?\p" + .string "I'm not near awake yet…\n" .string "You can have this…$" LilycoveCity_House2_Text_21EDF9: @ 821EDF9 diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 38210196e..8c3f4f7ab 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -10,10 +10,10 @@ LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B lock faceplayer - msgbox LilycoveCity_House3_Text_21EF99, 5 + msgbox LilycoveCity_House3_Text_21EF99, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_House3_EventScript_21EE75 - msgbox LilycoveCity_House3_Text_21F0F8, 4 + msgbox LilycoveCity_House3_Text_21F0F8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ LilycoveCity_House3_EventScript_21EE4B:: @ 821EE4B end LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 - msgbox LilycoveCity_House3_Text_21F0A9, 4 + msgbox LilycoveCity_House3_Text_21F0A9, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -31,7 +31,7 @@ LilycoveCity_House3_EventScript_21EE75:: @ 821EE75 LilycoveCity_House3_EventScript_21EE8A:: @ 821EE8A lock faceplayer - msgbox LilycoveCity_House3_Text_21F430, 4 + msgbox LilycoveCity_House3_Text_21F430, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_2725A2 waitmovement 0 @@ -79,31 +79,31 @@ LilycoveCity_House3_EventScript_21EF3D:: @ 821EF3D end LilycoveCity_House3_EventScript_21EF71:: @ 821EF71 - msgbox LilycoveCity_House3_Text_21F4A7, 4 + msgbox LilycoveCity_House3_Text_21F4A7, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF7B:: @ 821EF7B - msgbox LilycoveCity_House3_Text_21F4E0, 4 + msgbox LilycoveCity_House3_Text_21F4E0, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF85:: @ 821EF85 - msgbox LilycoveCity_House3_Text_21F523, 4 + msgbox LilycoveCity_House3_Text_21F523, MSGBOX_DEFAULT release end LilycoveCity_House3_EventScript_21EF8F:: @ 821EF8F - msgbox LilycoveCity_House3_Text_21F55A, 4 + msgbox LilycoveCity_House3_Text_21F55A, MSGBOX_DEFAULT release end LilycoveCity_House3_Text_21EF99: @ 821EF99 .string "Oh, my, my! Are you traveling alone?\n" - .string "But you’re so young! Good for you!\p" - .string "I’m sure my kids could learn a thing\n" + .string "But you're so young! Good for you!\p" + .string "I'm sure my kids could learn a thing\n" .string "or two from you!\p" - .string "Me? I’m a master of {POKEBLOCK}S.\p" + .string "Me? I'm a master of {POKEBLOCK}S.\p" .string "If I get serious just a little, why,\n" .string "I can concoct great {POKEBLOCK}S.\p" .string "Would you like to learn from me,\n" @@ -111,17 +111,17 @@ LilycoveCity_House3_Text_21EF99: @ 821EF99 LilycoveCity_House3_Text_21F0A9: @ 821F0A9 .string "Oh? Are you sure?\p" - .string "You shouldn’t always try to do\n" + .string "You shouldn't always try to do\n" .string "everything by yourself, dear!$" LilycoveCity_House3_Text_21F0F8: @ 821F0F8 - .string "Oh, good! You’re a smart soul!\n" + .string "Oh, good! You're a smart soul!\n" .string "This is a bit long, so listen up!\p" .string "Are you ready?\p" .string "If you look at {POKEBLOCK}S, you should see\n" .string "that they are rated on how they feel.\p" .string "The lower the feel rating,\n" - .string "the better it is. Don’t forget this!\p" + .string "the better it is. Don't forget this!\p" .string "A good {POKEBLOCK} has a low feel\n" .string "rating and a high level.\p" .string "A POKéMON can eat more good\n" @@ -129,19 +129,19 @@ LilycoveCity_House3_Text_21F0F8: @ 821F0F8 .string "And this is important.\p" .string "If you want to make smooth {POKEBLOCK}S,\n" .string "use different kinds of BERRIES.\p" - .string "Don’t be stingy--the kinds of BERRIES\n" + .string "Don't be stingy--the kinds of BERRIES\n" .string "affect the smoothness of {POKEBLOCK}S.\p" .string "And another thing.\p" .string "The more people blending BERRIES,\n" .string "the smoother the {POKEBLOCK}S.\p" - .string "That’s why you should talk to other\n" + .string "That's why you should talk to other\n" .string "people and make {POKEBLOCK}S together.\p" - .string "That’s about all you need to know to\n" + .string "That's about all you need to know to\n" .string "make good {POKEBLOCK}S.\p" .string "If everyone had POKéMON they love,\n" .string "smooth {POKEBLOCK}S, and a loving family,\l" .string "the world would be a happier place.\p" - .string "Don’t give up, dear!$" + .string "Don't give up, dear!$" LilycoveCity_House3_Text_21F430: @ 821F430 .string "When my wife gave birth to quadruplets,\n" @@ -150,8 +150,8 @@ LilycoveCity_House3_Text_21F430: @ 821F430 .string "it makes me happy.$" LilycoveCity_House3_Text_21F4A7: @ 821F4A7 - .string "We’re having MULTI BATTLES, but I know\n" - .string "I’m going to win.$" + .string "We're having MULTI BATTLES, but I know\n" + .string "I'm going to win.$" LilycoveCity_House3_Text_21F4E0: @ 821F4E0 .string "We like mixing stuff at\n" @@ -159,11 +159,11 @@ LilycoveCity_House3_Text_21F4E0: @ 821F4E0 .string "But what gets mixed up?$" LilycoveCity_House3_Text_21F523: @ 821F523 - .string "We’re going to make super {POKEBLOCK}S\n" + .string "We're going to make super {POKEBLOCK}S\n" .string "with a BERRY BLENDER!$" LilycoveCity_House3_Text_21F55A: @ 821F55A .string "I want to brag about how tough my\n" - .string "POKéMON is, so we’re going to enter\l" + .string "POKéMON is, so we're going to enter\l" .string "a CONTEST together.$" diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc index 8bfdb2d48..2306ff6df 100644 --- a/data/maps/LilycoveCity_House4/scripts.inc +++ b/data/maps/LilycoveCity_House4/scripts.inc @@ -2,20 +2,20 @@ LilycoveCity_House4_MapScripts:: @ 821F5B4 .byte 0 LilycoveCity_House4_EventScript_21F5B5:: @ 821F5B5 - msgbox LilycoveCity_House4_Text_21F5C7, 2 + msgbox LilycoveCity_House4_Text_21F5C7, MSGBOX_NPC end LilycoveCity_House4_EventScript_21F5BE:: @ 821F5BE - msgbox LilycoveCity_House4_Text_21F62B, 2 + msgbox LilycoveCity_House4_Text_21F62B, MSGBOX_NPC end LilycoveCity_House4_Text_21F5C7: @ 821F5C7 - .string "This planet’s biggest mysteries are\n" + .string "This planet's biggest mysteries are\n" .string "at the bottom of the sea.\p" - .string "Somebody said that, but I don’t know…$" + .string "Somebody said that, but I don't know…$" LilycoveCity_House4_Text_21F62B: @ 821F62B - .string "There’s a deep underwater trench\n" + .string "There's a deep underwater trench\n" .string "between MOSSDEEP and SOOTOPOLIS.\p" - .string "That’s what someone told me, anyway.$" + .string "That's what someone told me, anyway.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index c2f3be7d6..f56102a99 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8 .byte 0 LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9:: @ 8218CB9 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218E4B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 @@ -18,11 +18,11 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2:: @ 8218CC2 end LilycoveCity_LilycoveMuseum_1F_EventScript_218CEC:: @ 8218CEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F5C, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, 5 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218F98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_1F_EventScript_218D14 compare VAR_RESULT, 1 @@ -30,12 +30,12 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218CF5:: @ 8218CF5 end LilycoveCity_LilycoveMuseum_1F_EventScript_218D14:: @ 8218D14 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_218FF8, MSGBOX_SIGN releaseall end LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219035, MSGBOX_SIGN applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_218D99 waitmovement 0 removeobject 2 @@ -89,70 +89,70 @@ LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219080, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD:: @ 8218DAD - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190BF, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6:: @ 8218DB6 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2190F9, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF:: @ 8218DBF - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219142, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8:: @ 8218DC8 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2191A2, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1:: @ 8218DD1 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21920D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA:: @ 8218DDA LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA:: @ 8218DDA - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219260, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3:: @ 8218DE3 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2192AA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC:: @ 8218DEC - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219311, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5:: @ 8218DF5 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2193B4, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE:: @ 8218DFE - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21941A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E07:: @ 8218E07 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194BA, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E10:: @ 8218E10 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, 3 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2194E1, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_1F_EventScript_218E19:: @ 8218E19 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_219515, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E22:: @ 8218E22 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21959B, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B lock faceplayer - msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, 4 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_2195FF, MSGBOX_DEFAULT closemessage applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_2725A2 waitmovement 0 @@ -160,7 +160,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B:: @ 8218E2B end LilycoveCity_LilycoveMuseum_1F_EventScript_218E42:: @ 8218E42 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, 2 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_21967A, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B @@ -170,9 +170,9 @@ LilycoveCity_LilycoveMuseum_1F_Text_218E4B: @ 8218E4B .string "featuring POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_218EBC: @ 8218EBC - .string "I’m the CURATOR of this MUSEUM of\n" + .string "I'm the CURATOR of this MUSEUM of\n" .string "fine arts.\p" - .string "It’s heartening to see someone so\n" + .string "It's heartening to see someone so\n" .string "young as you in our MUSEUM.\p" .string "Have you viewed our collection of\n" .string "paintings already?$" @@ -189,7 +189,7 @@ LilycoveCity_LilycoveMuseum_1F_Text_218F98: @ 8218F98 LilycoveCity_LilycoveMuseum_1F_Text_218FF8: @ 8218FF8 .string "I see…\p" - .string "I’m honored that you would visit\n" + .string "I'm honored that you would visit\n" .string "us in spite of that.$" LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 @@ -198,46 +198,46 @@ LilycoveCity_LilycoveMuseum_1F_Text_219035: @ 8219035 .string "Then, may I ask you to come with me?$" LilycoveCity_LilycoveMuseum_1F_Text_219080: @ 8219080 - .string "It’s a very old painting.\n" + .string "It's a very old painting.\n" .string "The paint is peeling here and there.$" LilycoveCity_LilycoveMuseum_1F_Text_2190BF: @ 82190BF - .string "It’s an odd landscape with bizarre\n" + .string "It's an odd landscape with bizarre\n" .string "and fantastic scenery.$" LilycoveCity_LilycoveMuseum_1F_Text_2190F9: @ 82190F9 - .string "It’s a painting of a beautiful, smiling\n" + .string "It's a painting of a beautiful, smiling\n" .string "woman with a POKéMON on her lap.$" LilycoveCity_LilycoveMuseum_1F_Text_219142: @ 8219142 - .string "It’s a painting of a legendary POKéMON\n" + .string "It's a painting of a legendary POKéMON\n" .string "from long ago.\p" .string "The artist painted this from\n" .string "imagination.$" LilycoveCity_LilycoveMuseum_1F_Text_2191A2: @ 82191A2 - .string "It’s a painting of GRASS POKéMON\n" + .string "It's a painting of GRASS POKéMON\n" .string "swaying in a breeze.\p" - .string "They appear to be enjoying the wind’s\n" + .string "They appear to be enjoying the wind's\n" .string "gentle caress.$" LilycoveCity_LilycoveMuseum_1F_Text_21920D: @ 821920D - .string "It’s a delicious-looking painting\n" + .string "It's a delicious-looking painting\n" .string "of BERRIES.\p" .string "This painting could make you hungry!$" LilycoveCity_LilycoveMuseum_1F_Text_219260: @ 8219260 - .string "It’s a replica of a famous sculpture.\p" + .string "It's a replica of a famous sculpture.\p" .string "It depicts an ancient BIRD POKéMON.$" LilycoveCity_LilycoveMuseum_1F_Text_2192AA: @ 82192AA - .string "It’s a big POKé BALL carved from\n" + .string "It's a big POKé BALL carved from\n" .string "a black stone.\p" .string "It was apparently used in festivals\n" .string "in the olden days.$" LilycoveCity_LilycoveMuseum_1F_Text_219311: @ 8219311 - .string "It’s a huge stone tablet inscribed\n" + .string "It's a huge stone tablet inscribed\n" .string "with POKéMON and dense text in the\l" .string "small characters of an ancient,\l" .string "unreadable language.$" @@ -248,8 +248,8 @@ LilycoveCity_LilycoveMuseum_1F_Text_21938C: @ 821938C LilycoveCity_LilycoveMuseum_1F_Text_2193B4: @ 82193B4 .string "Battling with POKéMON is fun,\n" - .string "I’ll grant you that.\p" - .string "But one mustn’t forget our love for\n" + .string "I'll grant you that.\p" + .string "But one mustn't forget our love for\n" .string "the fine arts.$" LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A @@ -261,14 +261,14 @@ LilycoveCity_LilycoveMuseum_1F_Text_21941A: @ 821941A LilycoveCity_LilycoveMuseum_1F_Text_2194BA: @ 82194BA .string "This lady is pretty!\n" - .string "She’s like Mommy!$" + .string "She's like Mommy!$" LilycoveCity_LilycoveMuseum_1F_Text_2194E1: @ 82194E1 .string "This POKéMON is adorable!\n" .string "Just like our little boy!$" LilycoveCity_LilycoveMuseum_1F_Text_219515: @ 8219515 - .string "I’d heard that this ART MUSEUM got\n" + .string "I'd heard that this ART MUSEUM got\n" .string "in some new paintings.\p" .string "So, naturally I hurried over.\p" .string "Are the new paintings up on\n" @@ -289,8 +289,8 @@ LilycoveCity_LilycoveMuseum_1F_Text_2195FF: @ 82195FF LilycoveCity_LilycoveMuseum_1F_Text_21967A: @ 821967A .string "The ART MUSEUM has become a favorite\n" .string "tourist destination.\p" - .string "It’s great for LILYCOVE…\n" + .string "It's great for LILYCOVE…\n" .string "No, great for the HOENN region!\p" - .string "This is what I’ve heard--a lone TRAINER\n" + .string "This is what I've heard--a lone TRAINER\n" .string "procured all the paintings upstairs.$" diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 6b4f0f3da..5f2b64aec 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -70,17 +70,17 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_2199EB, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219863 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219A0D, MSGBOX_SIGN applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_219861 waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219BC4, MSGBOX_SIGN copyvar VAR_0x4094, 0x1 releaseall end @@ -105,25 +105,25 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219CF3, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA:: @ 82198BA - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219D42, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2198C3:: @ 82198C3 applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E waitmovement 0 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DD4, MSGBOX_DEFAULT applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_219863 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219DE6, MSGBOX_DEFAULT goto LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA end LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_27259E - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EC5, MSGBOX_DEFAULT givedecoration_std 44 compare VAR_RESULT, 0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 @@ -134,13 +134,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA LilycoveCity_LilycoveMuseum_2F_EventScript_219911:: @ 8219911 call LilycoveCity_LilycoveMuseum_2F_EventScript_272071 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, 4 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219EED, MSGBOX_DEFAULT closemessage releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219F1B, MSGBOX_NPC releaseall end @@ -148,79 +148,79 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall checkflag FLAG_0x0A2 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall checkflag FLAG_0x0A4 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall checkflag FLAG_0x0A0 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall checkflag FLAG_0x0A1 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall checkflag FLAG_0x0A3 goto_eq LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21998A:: @ 821998A - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0BD, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_219993:: @ 8219993 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A132, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_21999C:: @ 821999C - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, 2 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A1A8, MSGBOX_NPC end LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5:: @ 82199A5 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3:: @ 82199B3 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1:: @ 82199C1 - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF:: @ 82199CF - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD:: @ 82199DD - msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, 3 + msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A0A1, MSGBOX_SIGN fadescreen 1 drawcontestwinner 13 releaseall @@ -232,7 +232,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_2199EB: @ 82199EB LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D .string "As you can plainly see, there is not\n" .string "a single painting on exhibit.\p" - .string "Here, I don’t wish to exhibit works of\n" + .string "Here, I don't wish to exhibit works of\n" .string "so-called classical art.\p" .string "Such classical works you can see on\n" .string "our ground floor.\p" @@ -246,7 +246,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219A0D: @ 8219A0D .string "forth into glorious life!$" LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 - .string "I beg your pardon. I didn’t intend\n" + .string "I beg your pardon. I didn't intend\n" .string "to monopolize the conversation.\p" .string "Now, as you are young, and yet\n" .string "obviously well traveled…\p" @@ -254,7 +254,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_219BC4: @ 8219BC4 .string "and works of art depicting them.\p" .string "If you were to come across such\n" .string "a painting, may we ask you to obtain\l" - .string "the artist’s permission to exhibit\l" + .string "the artist's permission to exhibit\l" .string "it here?$" LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 @@ -263,18 +263,18 @@ LilycoveCity_LilycoveMuseum_2F_Text_219CF3: @ 8219CF3 .string "POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_219D42: @ 8219D42 - .string "Thanks to you, we’ve added a new\n" + .string "Thanks to you, we've added a new\n" .string "painting to our collection!\p" - .string "I’ve heard it depicts your POKéMON.\n" + .string "I've heard it depicts your POKéMON.\n" .string "Truly magnificent!\p" .string "Thank you so very, very much!$" LilycoveCity_LilycoveMuseum_2F_Text_219DD4: @ 8219DD4 - .string "Ah! It’s you!\n" + .string "Ah! It's you!\n" .string "{PLAYER}!$" LilycoveCity_LilycoveMuseum_2F_Text_219DE6: @ 8219DE6 - .string "Isn’t this marvelous?\n" + .string "Isn't this marvelous?\n" .string "This collection of paintings!\p" .string "Each one of them flawless!\n" .string "None better than another!\p" @@ -292,36 +292,36 @@ LilycoveCity_LilycoveMuseum_2F_Text_219EED: @ 8219EED LilycoveCity_LilycoveMuseum_2F_Text_219F1B: @ 8219F1B .string "Ah, so good to see you, {PLAYER}!\p" - .string "It’s an honor to have you visit us\n" + .string "It's an honor to have you visit us\n" .string "on your busy journeys.\p" .string "Please, relax and do enjoy your\n" .string "visit with us.$" LilycoveCity_LilycoveMuseum_2F_Text_219FA0: @ 8219FA0 - .string "It’s a picture frame with pink-colored\n" + .string "It's a picture frame with pink-colored\n" .string "adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_219FD3: @ 8219FD3 - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "yellow-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A008: @ 821A008 - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "blue-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A03B: @ 821A03B - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "red-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A06D: @ 821A06D - .string "It’s a picture frame with\n" + .string "It's a picture frame with\n" .string "green-colored adornments.$" LilycoveCity_LilycoveMuseum_2F_Text_21A0A1: @ 821A0A1 - .string "It’s a painting of POKéMON.$" + .string "It's a painting of POKéMON.$" LilycoveCity_LilycoveMuseum_2F_Text_21A0BD: @ 821A0BD - .string "I’ve been away awhile, so the new\n" + .string "I've been away awhile, so the new\n" .string "paintings up here surprised me.\p" .string "I wish someone would paint my POKéMON\n" .string "this pretty.$" @@ -335,6 +335,6 @@ LilycoveCity_LilycoveMuseum_2F_Text_21A132: @ 821A132 LilycoveCity_LilycoveMuseum_2F_Text_21A1A8: @ 821A1A8 .string "Wow, is that right?\n" .string "These paintings are of your POKéMON.\p" - .string "Isn’t that just the ultimate joy for\n" + .string "Isn't that just the ultimate joy for\n" .string "a TRAINER?$" diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 19471d2e1..160dab557 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -5,7 +5,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_27259E waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EAFD, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EA3B case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -13,7 +13,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA0B:: @ 821EA0B end LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB65, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -24,14 +24,14 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EA3B:: @ 821EA3B special sub_81B96D0 compare VAR_RESULT, 1 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EACF - msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EB89, MSGBOX_DEFAULT fadescreen 1 special sub_81B968C fadescreen 0 compare VAR_0x8005, 4 goto_eq LilycoveCity_MoveDeletersHouse_EventScript_21EA3B special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBDA, MSGBOX_YESNO switch VAR_RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_21EAB0 case 0, LilycoveCity_MoveDeletersHouse_EventScript_21EAE6 @@ -45,35 +45,35 @@ LilycoveCity_MoveDeletersHouse_EventScript_21EAB0:: @ 821EAB0 special sub_81B9770 playfanfare MUS_ME_WASURE waitfanfare - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC06, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EACF:: @ 821EACF special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EBA9, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EADC:: @ 821EADC - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC78, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAE6:: @ 821EAE6 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC3F, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_EventScript_21EAF0:: @ 821EAF0 special sub_81B9718 - msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, 4 + msgbox LilycoveCity_MoveDeletersHouse_Text_21EC9C, MSGBOX_DEFAULT releaseall end LilycoveCity_MoveDeletersHouse_Text_21EAFD: @ 821EAFD .string "Uh…\n" - .string "Oh, yes, I’m the MOVE DELETER.\p" + .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their moves.\p" .string "Would you like me to do that?$" @@ -85,10 +85,10 @@ LilycoveCity_MoveDeletersHouse_Text_21EB89: @ 821EB89 LilycoveCity_MoveDeletersHouse_Text_21EBA9: @ 821EBA9 .string "{STR_VAR_1} knows only one move\n" - .string "so it can’t be forgotten…$" + .string "so it can't be forgotten…$" LilycoveCity_MoveDeletersHouse_Text_21EBDA: @ 821EBDA - .string "Hm! {STR_VAR_1}’s {STR_VAR_2}?\n" + .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" LilycoveCity_MoveDeletersHouse_Text_21EC06: @ 821EC06 @@ -106,6 +106,6 @@ LilycoveCity_MoveDeletersHouse_Text_21EC78: @ 821EC78 LilycoveCity_MoveDeletersHouse_Text_21EC9C: @ 821EC9C .string "Hm!\p" - .string "Your {STR_VAR_1} doesn’t seem willing\n" + .string "Your {STR_VAR_1} doesn't seem willing\n" .string "to forget SURF.$" diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index f4a21637b..5e51f7daa 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -33,7 +33,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5E8:: @ 821C5E8 end LilycoveCity_PokemonCenter_1F_EventScript_21C5F6:: @ 821C5F6 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, 2 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C61E, MSGBOX_NPC end LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF @@ -41,28 +41,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_21C5FF:: @ 821C5FF faceplayer checkflag FLAG_BADGE07_GET goto_eq LilycoveCity_PokemonCenter_1F_EventScript_21C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C69D, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_EventScript_21C614:: @ 821C614 - msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, 4 + msgbox LilycoveCity_PokemonCenter_1F_Text_21C6F6, MSGBOX_DEFAULT release end LilycoveCity_PokemonCenter_1F_Text_21C61E: @ 821C61E .string "I wonder how many kinds of POKéMON\n" .string "there are in the world.\p" - .string "It’d be great to cross seas and\n" + .string "It'd be great to cross seas and\n" .string "trade POKéMON with people far away.$" LilycoveCity_PokemonCenter_1F_Text_21C69D: @ 821C69D - .string "I’ve been hearing about some rotten\n" + .string "I've been hearing about some rotten\n" .string "scoundrels who steal POKéMON and rip\l" .string "off METEORITES.$" LilycoveCity_PokemonCenter_1F_Text_21C6F6: @ 821C6F6 .string "Those rotten scoundrels who steal\n" .string "POKéMON and rip off METEORITES…\p" - .string "I haven’t seen them around recently.$" + .string "I haven't seen them around recently.$" diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index 8735811bf..d4c0f4cea 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -11,13 +11,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A lockall applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_2725AA waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A8 waitmovement 0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 waitmovement 0 applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_2725A4 @@ -217,7 +217,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17:: @ 821CA17 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D12A, MSGBOX_DEFAULT release end @@ -225,22 +225,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA56:: @ 821CA56 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D094, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA70:: @ 821CA70 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D0BB, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA7A:: @ 821CA7A - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D1B5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CA84:: @ 821CA84 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D20C, MSGBOX_DEFAULT release end @@ -257,7 +257,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E:: @ 821CA8E specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D347, MSGBOX_DEFAULT release end @@ -265,22 +265,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CACD:: @ 821CACD specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2A6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAE7:: @ 821CAE7 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D2CE, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAF1:: @ 821CAF1 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D377, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CAFB:: @ 821CAFB - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D3EE, MSGBOX_DEFAULT release end @@ -297,7 +297,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05:: @ 821CB05 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D52E, MSGBOX_DEFAULT release end @@ -305,22 +305,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB44:: @ 821CB44 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D438, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB5E:: @ 821CB5E - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D4A3, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB68:: @ 821CB68 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D5DC, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CB72:: @ 821CB72 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D69C, MSGBOX_DEFAULT release end @@ -337,7 +337,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C:: @ 821CB7C specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D822, MSGBOX_DEFAULT release end @@ -345,22 +345,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBBB:: @ 821CBBB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D751, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBD5:: @ 821CBD5 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D79B, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBDF:: @ 821CBDF - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D857, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CBE9:: @ 821CBE9 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D8C4, MSGBOX_DEFAULT release end @@ -375,7 +375,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3:: @ 821CBF3 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D9D1, MSGBOX_DEFAULT release end @@ -383,17 +383,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC27:: @ 821CC27 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D921, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC41:: @ 821CC41 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21D96A, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CC4B:: @ 821CC4B - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA0D, MSGBOX_DEFAULT release end @@ -408,7 +408,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55:: @ 821CC55 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DB69, MSGBOX_DEFAULT release end @@ -416,17 +416,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CC89:: @ 821CC89 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DA73, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCA3:: @ 821CCA3 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DAF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CCAD:: @ 821CCAD - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DBFB, MSGBOX_DEFAULT release end @@ -441,7 +441,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7:: @ 821CCB7 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DD36, MSGBOX_DEFAULT release end @@ -449,17 +449,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CCEB:: @ 821CCEB specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DC68, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD05:: @ 821CD05 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DCD6, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD0F:: @ 821CD0F - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DDCE, MSGBOX_DEFAULT release end @@ -474,7 +474,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19:: @ 821CD19 specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 7 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DEFF, MSGBOX_DEFAULT release end @@ -482,17 +482,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD4D:: @ 821CD4D specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE72, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD67:: @ 821CD67 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DE83, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_21DF51, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 copyvar VAR_0x800A, VAR_0x8006 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -526,14 +526,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0 - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D end LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -543,7 +543,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT setvar VAR_0x8004, 14 copyvar VAR_0x8005, VAR_0x800A call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C @@ -578,7 +578,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, 5 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6 compare VAR_RESULT, 0 @@ -588,14 +588,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT release end LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT setflag FLAG_0x0D2 release end @@ -603,7 +603,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED setvar VAR_0x8004, 8 special BufferStreakTrainerText - msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, 4 + msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT release end @@ -612,50 +612,50 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF LilycoveCity_PokemonTrainerFanClub_Text_21CF00: @ 821CF00 .string "Oh, wow!\n" - .string "It’s {PLAYER}!$" + .string "It's {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21CF12: @ 821CF12 - .string "I’ve heard the news!\n" - .string "You’re really strong, aren’t you?\p" + .string "I've heard the news!\n" + .string "You're really strong, aren't you?\p" .string "We always argue about who is the\n" .string "strongest of all TRAINERS here.\p" .string "So when I heard about you, I decided\n" .string "to be your fan!\p" - .string "I hope you’ll keep on battling other\n" + .string "I hope you'll keep on battling other\n" .string "tough TRAINERS.\p" - .string "That way, we’ll be able to see more\n" + .string "That way, we'll be able to see more\n" .string "of your hot, hot battles.\p" .string "That will make the others here see\n" .string "exactly how great you are.\p" - .string "Remember, I’m cheering for you,\n" + .string "Remember, I'm cheering for you,\n" .string "{PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D094: @ 821D094 .string "Yo, {PLAYER}!\n" - .string "You’re the one we want to win!$" + .string "You're the one we want to win!$" LilycoveCity_PokemonTrainerFanClub_Text_21D0BB: @ 821D0BB - .string "The others, they don’t know that\n" - .string "you’re the best of the best!\p" - .string "Isn’t that right, {PLAYER}?\n" - .string "Show them you’ve got guts!$" + .string "The others, they don't know that\n" + .string "you're the best of the best!\p" + .string "Isn't that right, {PLAYER}?\n" + .string "Show them you've got guts!$" LilycoveCity_PokemonTrainerFanClub_Text_21D12A: @ 821D12A .string "I hate to say this, but the TRAINER\n" - .string "everybody’s talking about is\l" + .string "everybody's talking about is\l" .string "{STR_VAR_1}, no question about it!\p" - .string "That TRAINER’s power…\n" - .string "It’s out of the ordinary.$" + .string "That TRAINER's power…\n" + .string "It's out of the ordinary.$" LilycoveCity_PokemonTrainerFanClub_Text_21D1B5: @ 821D1B5 - .string "Darn it… I’ve been telling people\n" + .string "Darn it… I've been telling people\n" .string "that {STR_VAR_1} is the best now…\p" .string "But no one wants to listen…$" LilycoveCity_PokemonTrainerFanClub_Text_21D20C: @ 821D20C - .string "I’ve been hearing things about\n" + .string "I've been hearing things about\n" .string "a tough new TRAINER.\p" - .string "This TRAINER’s supposed to be beating\n" + .string "This TRAINER's supposed to be beating\n" .string "GYM LEADERS, even.\p" .string "Do you know anything about this\n" .string "new TRAINER?$" @@ -664,37 +664,37 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D2A6: @ 821D2A6 .string "Oh!\n" .string "{PLAYER}!\p" .string "Go for it!\n" - .string "I’m pulling for you!$" + .string "I'm pulling for you!$" LilycoveCity_PokemonTrainerFanClub_Text_21D2CE: @ 821D2CE .string "Sigh…\n" .string "BRAWLY…\p" .string "Oh, no! Wait!\n" - .string "That’s not right! No, no, no!\p" - .string "I’m your fan through and through!\p" + .string "That's not right! No, no, no!\p" + .string "I'm your fan through and through!\p" .string "So make me proud!\n" .string "Go for it!$" LilycoveCity_PokemonTrainerFanClub_Text_21D347: @ 821D347 - .string "I can’t help it, I can only get to\n" + .string "I can't help it, I can only get to\n" .string "like BRAWLY…$" LilycoveCity_PokemonTrainerFanClub_Text_21D377: @ 821D377 .string "Nobody understands the charm of\n" .string "BRAWLY…\p" - .string "I don’t care!\p" - .string "Even if I’m the only one, I’m going\n" + .string "I don't care!\p" + .string "Even if I'm the only one, I'm going\n" .string "to keep cheering for BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_21D3EE: @ 821D3EE .string "Whatever anyone says, my favorite\n" - .string "TRAINER is DEWFORD’s GYM LEADER\l" + .string "TRAINER is DEWFORD's GYM LEADER\l" .string "BRAWLY!$" LilycoveCity_PokemonTrainerFanClub_Text_21D438: @ 821D438 - .string "You’ve surpassed your own father in\n" + .string "You've surpassed your own father in\n" .string "every regard!\p" - .string "I’m telling you, so there’s no question\n" + .string "I'm telling you, so there's no question\n" .string "about it at all!$" LilycoveCity_PokemonTrainerFanClub_Text_21D4A3: @ 821D4A3 @@ -708,20 +708,20 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D52E: @ 821D52E .string "NORMAN battled with more power,\n" .string "charisma, and showmanship than you.\p" .string "Even though people may say that\n" - .string "you’re strong…\p" - .string "You’ve still got a long way to go\n" + .string "you're strong…\p" + .string "You've still got a long way to go\n" .string "compared to your father.$" LilycoveCity_PokemonTrainerFanClub_Text_21D5DC: @ 821D5DC - .string "You’re beginning to get the same\n" + .string "You're beginning to get the same\n" .string "air of awe NORMAN exudes.\p" - .string "But there’s something conclusively\n" + .string "But there's something conclusively\n" .string "different between you and NORMAN.\p" - .string "I can’t tell you what that is.\n" - .string "You’ll have to find it yourself.$" + .string "I can't tell you what that is.\n" + .string "You'll have to find it yourself.$" LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C - .string "Everyone here, we’re all huge fans\n" + .string "Everyone here, we're all huge fans\n" .string "of POKéMON battles.\p" .string "We discuss who we consider to be\n" .string "the strongest of all TRAINERS.\p" @@ -729,16 +729,16 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D69C: @ 821D69C .string "we might even become your fans!$" LilycoveCity_PokemonTrainerFanClub_Text_21D751: @ 821D751 - .string "Oh, woweee! It’s {PLAYER}!\n" + .string "Oh, woweee! It's {PLAYER}!\n" .string "For real, too!\p" .string "Please, shake my hand, shake my hand!$" LilycoveCity_PokemonTrainerFanClub_Text_21D79B: @ 821D79B - .string "I’ll always cheer for you, {PLAYER}!\n" + .string "I'll always cheer for you, {PLAYER}!\n" .string "Always, always!\p" - .string "I don’t want to see you lose ever,\n" + .string "I don't want to see you lose ever,\n" .string "{PLAYER}.\p" - .string "Because I know you’re really,\n" + .string "Because I know you're really,\n" .string "really strong, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 @@ -746,9 +746,9 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D822: @ 821D822 .string "Everyone thinks so, right, right?$" LilycoveCity_PokemonTrainerFanClub_Text_21D857: @ 821D857 - .string "{STR_VAR_1} really is cool, don’t\n" + .string "{STR_VAR_1} really is cool, don't\n" .string "you think so?\p" - .string "Even if it’s just me, I’m going to keep\n" + .string "Even if it's just me, I'm going to keep\n" .string "cheering my favorite TRAINER.$" LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 @@ -759,14 +759,14 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D8C4: @ 821D8C4 .string "I wish there was a TRAINER like that…$" LilycoveCity_PokemonTrainerFanClub_Text_21D921: @ 821D921 - .string "Whoa! It’s {PLAYER}!\n" + .string "Whoa! It's {PLAYER}!\n" .string "Wicked!\p" .string "When I grow up, I want to be strong\n" .string "like you, {PLAYER}!$" LilycoveCity_PokemonTrainerFanClub_Text_21D96A: @ 821D96A - .string "Even if I’m the only one…\p" - .string "You’ll always be the only one\n" + .string "Even if I'm the only one…\p" + .string "You'll always be the only one\n" .string "I cheer for, {PLAYER}!\p" .string "Because I believe in you, {PLAYER}!$" @@ -775,10 +775,10 @@ LilycoveCity_PokemonTrainerFanClub_Text_21D9D1: @ 821D9D1 .string "I want to shake hands with my hero.$" LilycoveCity_PokemonTrainerFanClub_Text_21DA0D: @ 821DA0D - .string "Even if I’m the only one…\p" - .string "I’m never going to stop being\n" - .string "{STR_VAR_1}’s fan!\p" - .string "Because I’ve heard, {STR_VAR_1}\n" + .string "Even if I'm the only one…\p" + .string "I'm never going to stop being\n" + .string "{STR_VAR_1}'s fan!\p" + .string "Because I've heard, {STR_VAR_1}\n" .string "never loses!$" LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 @@ -786,54 +786,54 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DA73: @ 821DA73 .string "You are amazing after all!\p" .string "Ever since I set eyes on you,\n" .string "I knew that you were great.\p" - .string "It looks like my eyes didn’t deceive me.$" + .string "It looks like my eyes didn't deceive me.$" LilycoveCity_PokemonTrainerFanClub_Text_21DAF5: @ 821DAF5 .string "Who cares about the others.\n" - .string "I’m in your corner!\p" - .string "You don’t need to worry. Just get\n" + .string "I'm in your corner!\p" + .string "You don't need to worry. Just get\n" .string "out there and battle like always.$" LilycoveCity_PokemonTrainerFanClub_Text_21DB69: @ 821DB69 - .string "You’re a pretty decent TRAINER,\n" + .string "You're a pretty decent TRAINER,\n" .string "I think.\p" .string "But I also think that {STR_VAR_1}\n" .string "is number one right now.\p" - .string "That’s just my opinion.\n" - .string "Don’t worry about it too much.$" + .string "That's just my opinion.\n" + .string "Don't worry about it too much.$" LilycoveCity_PokemonTrainerFanClub_Text_21DBFB: @ 821DBFB .string "Wow, you really are strong.\n" .string "Maybe even stronger than {STR_VAR_1}.\p" .string "But {STR_VAR_1} needs me.\p" - .string "If I don’t cheer for {STR_VAR_1},\n" + .string "If I don't cheer for {STR_VAR_1},\n" .string "who will?$" LilycoveCity_PokemonTrainerFanClub_Text_21DC68: @ 821DC68 - .string "You’ve changed my mind!\n" - .string "You are strong, aren’t you?\p" - .string "I’d like you to tell me how you managed\n" + .string "You've changed my mind!\n" + .string "You are strong, aren't you?\p" + .string "I'd like you to tell me how you managed\n" .string "to get so strong!$" LilycoveCity_PokemonTrainerFanClub_Text_21DCD6: @ 821DCD6 .string "The tougher the situation, the more\n" .string "attractively you battle.\p" - .string "I can’t wait for your next battle!$" + .string "I can't wait for your next battle!$" LilycoveCity_PokemonTrainerFanClub_Text_21DD36: @ 821DD36 .string "Among the recently hot TRAINERS,\n" .string "{STR_VAR_1} is the standout.\p" - .string "That toughness, it’s simply not normal.\p" - .string "You’re doing okay, but you’re not in\n" + .string "That toughness, it's simply not normal.\p" + .string "You're doing okay, but you're not in\n" .string "the same class as {STR_VAR_1}.$" LilycoveCity_PokemonTrainerFanClub_Text_21DDCE: @ 821DDCE .string "You are really popular…\p" - .string "You’re strong, and you’re caring to\n" + .string "You're strong, and you're caring to\n" .string "POKéMON. No one can knock you.\p" .string "But, you know, I believe in {STR_VAR_1}.\p" .string "{STR_VAR_1} is definitely stronger!\n" - .string "I’m positive!$" + .string "I'm positive!$" LilycoveCity_PokemonTrainerFanClub_Text_21DE72: @ 821DE72 .string "You…\p" @@ -848,7 +848,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DE83: @ 821DE83 LilycoveCity_PokemonTrainerFanClub_Text_21DEFF: @ 821DEFF .string "Yes, I see strength in your eyes.\p" .string "But!\p" - .string "You still haven’t realized your\n" + .string "You still haven't realized your\n" .string "potential.$" LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51 diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 03100ee66..660a3984d 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -126,7 +126,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 delay 10 applymovement 4, LittlerootTown_Movement_1E7F9A waitmovement 0 - msgbox LittlerootTown_Text_1E86BC, 4 + msgbox LittlerootTown_Text_1E86BC, MSGBOX_DEFAULT closemessage applymovement 4, LittlerootTown_Movement_1E7F9D applymovement 255, LittlerootTown_Movement_1E7FA4 @@ -190,7 +190,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 applymovement 8, LittlerootTown_Movement_272598 waitmovement 0 delay 80 - msgbox LittlerootTown_Text_1E8DA2, 4 + msgbox LittlerootTown_Text_1E8DA2, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH @@ -225,11 +225,11 @@ LittlerootTown_EventScript_1E8013:: @ 81E8013 end LittlerootTown_EventScript_1E8022:: @ 81E8022 - msgbox LittlerootTown_Text_1E8ACF, 2 + msgbox LittlerootTown_Text_1E8ACF, MSGBOX_NPC end LittlerootTown_EventScript_1E802B:: @ 81E802B - msgbox LittlerootTown_Text_1E8B25, 2 + msgbox LittlerootTown_Text_1E8B25, MSGBOX_NPC end LittlerootTown_EventScript_1E8034:: @ 81E8034 @@ -241,13 +241,13 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034 goto_eq LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 goto_if 5, LittlerootTown_EventScript_1E805D - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E805D:: @ 81E805D special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -257,12 +257,12 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D LittlerootTown_EventScript_1E807A:: @ 81E807A special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8CE3, 4 + msgbox LittlerootTown_Text_1E8CE3, MSGBOX_DEFAULT release end LittlerootTown_EventScript_1E8087:: @ 81E8087 - msgbox LittlerootTown_Text_1E8D07, 4 + msgbox LittlerootTown_Text_1E8D07, MSGBOX_DEFAULT release end @@ -277,12 +277,12 @@ LittlerootTown_EventScript_1E8091:: @ 81E8091 end LittlerootTown_EventScript_1E80AD:: @ 81E80AD - msgbox LittlerootTown_Text_1E8BB8, 4 + msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_1E80DF applymovement 255, LittlerootTown_Movement_1E80EB waitmovement 0 - msgbox LittlerootTown_Text_1E8C07, 4 + msgbox LittlerootTown_Text_1E8C07, MSGBOX_DEFAULT closemessage return @@ -365,7 +365,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F applymovement 255, LittlerootTown_Movement_2725A4 waitmovement 0 special GetPlayerBigGuyGirlString - msgbox LittlerootTown_Text_1E8C3A, 4 + msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_Movement_2725A2 waitmovement 0 @@ -374,11 +374,11 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F end LittlerootTown_EventScript_1E8151:: @ 81E8151 - msgbox LittlerootTown_Text_1E8D32, 3 + msgbox LittlerootTown_Text_1E8D32, MSGBOX_SIGN end LittlerootTown_EventScript_1E815A:: @ 81E815A - msgbox LittlerootTown_Text_1E8D69, 3 + msgbox LittlerootTown_Text_1E8D69, MSGBOX_SIGN end LittlerootTown_EventScript_1E8163:: @ 81E8163 @@ -392,11 +392,11 @@ LittlerootTown_EventScript_1E8163:: @ 81E8163 end LittlerootTown_EventScript_1E817D:: @ 81E817D - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E8186:: @ 81E8186 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E818F:: @ 81E818F @@ -410,11 +410,11 @@ LittlerootTown_EventScript_1E818F:: @ 81E818F end LittlerootTown_EventScript_1E81A9:: @ 81E81A9 - msgbox LittlerootTown_Text_1E8D8E, 4 + msgbox LittlerootTown_Text_1E8D8E, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81B2:: @ 81E81B2 - msgbox LittlerootTown_Text_1E8D83, 4 + msgbox LittlerootTown_Text_1E8D83, MSGBOX_DEFAULT return LittlerootTown_EventScript_1E81BB:: @ 81E81BB @@ -466,7 +466,7 @@ LittlerootTown_EventScript_1E8211:: @ 81E8211 call_if 1, LittlerootTown_EventScript_1E8281 compare VAR_RESULT, 1 call_if 1, LittlerootTown_EventScript_1E828C - msgbox LittlerootTown_Text_1E87E1, 4 + msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT closemessage checkplayergender compare VAR_RESULT, 0 @@ -917,28 +917,28 @@ LittlerootTown_EventScript_1E8686:: @ 81E8686 end LittlerootTown_EventScript_1E8693:: @ 81E8693 - msgbox LittlerootTown_Text_1E87F0, 4 + msgbox LittlerootTown_Text_1E87F0, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare setflag FLAG_0x112 - msgbox LittlerootTown_Text_1E894F, 4 - msgbox LittlerootTown_Text_1E8A03, 4 + msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT + msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT closemessage delay 30 return LittlerootTown_Text_1E86BC: @ 81E86BC - .string "MOM: {PLAYER}, we’re here, honey!\p" + .string "MOM: {PLAYER}, we're here, honey!\p" .string "It must be tiring riding with our things\n" .string "in the moving truck.\p" .string "Well, this is LITTLEROOT TOWN.\p" .string "How do you like it?\n" .string "This is our new home!\p" .string "It has a quaint feel, but it seems to be\n" - .string "an easy place to live, don’t you think?\p" + .string "an easy place to live, don't you think?\p" .string "And, you get your own room, {PLAYER}!\n" - .string "Let’s go inside.$" + .string "Let's go inside.$" LittlerootTown_Text_1E87E1: @ 81E87E1 .string "MOM: Wait, {PLAYER}!$" @@ -948,11 +948,11 @@ LittlerootTown_Text_1E87F0: @ 81E87F0 .string "introduce yourself to PROF. BIRCH?\p" .string "Oh! What an adorable POKéMON!\n" .string "You got it from PROF. BIRCH. How nice!\p" - .string "You’re your father’s child, all right.\n" + .string "You're your father's child, all right.\n" .string "You look good together with POKéMON!\p" - .string "Here, honey! If you’re going out on an\n" + .string "Here, honey! If you're going out on an\n" .string "adventure, wear these RUNNING SHOES.\p" - .string "They’ll put a zip in your step!$" + .string "They'll put a zip in your step!$" LittlerootTown_Text_1E8925: @ 81E8925 .string "{PLAYER} switched shoes with the\n" @@ -983,7 +983,7 @@ LittlerootTown_Text_1E8ACF: @ 81E8ACF LittlerootTown_Text_1E8B25: @ 81E8B25 .string "PROF. BIRCH spends days in his LAB\n" - .string "studying, then he’ll suddenly go out in\l" + .string "studying, then he'll suddenly go out in\l" .string "the wild to do more research…\p" .string "When does PROF. BIRCH spend time\n" .string "at home?$" @@ -994,21 +994,21 @@ LittlerootTown_Text_1E8BB8: @ 81E8BB8 .string "wild POKéMON will jump out!$" LittlerootTown_Text_1E8C07: @ 81E8C07 - .string "It’s dangerous if you don’t have\n" + .string "It's dangerous if you don't have\n" .string "your own POKéMON.$" LittlerootTown_Text_1E8C3A: @ 81E8C3A .string "Um, hi!\p" .string "There are scary POKéMON outside!\n" .string "I can hear their cries!\p" - .string "I want to go see what’s going on,\n" - .string "but I don’t have any POKéMON…\p" - .string "Can you go see what’s happening\n" + .string "I want to go see what's going on,\n" + .string "but I don't have any POKéMON…\p" + .string "Can you go see what's happening\n" .string "for me?$" LittlerootTown_Text_1E8CE3: @ 81E8CE3 .string "You saved PROF. BIRCH!\n" - .string "I’m so glad!$" + .string "I'm so glad!$" LittlerootTown_Text_1E8D07: @ 81E8D07 .string "Are you going to catch POKéMON?\n" @@ -1016,16 +1016,16 @@ LittlerootTown_Text_1E8D07: @ 81E8D07 LittlerootTown_Text_1E8D32: @ 81E8D32 .string "LITTLEROOT TOWN\n" - .string "“A town that can’t be shaded any hue.”$" + .string "“A town that can't be shaded any hue.”$" LittlerootTown_Text_1E8D69: @ 81E8D69 - .string "PROF. BIRCH’S POKéMON LAB$" + .string "PROF. BIRCH'S POKéMON LAB$" LittlerootTown_Text_1E8D83: @ 81E8D83 - .string "{PLAYER}’s HOUSE$" + .string "{PLAYER}'s HOUSE$" LittlerootTown_Text_1E8D8E: @ 81E8D8E - .string "PROF. BIRCH’S HOUSE$" + .string "PROF. BIRCH'S HOUSE$" LittlerootTown_Text_1E8DA2: @ 81E8DA2 .string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n" @@ -1036,5 +1036,5 @@ LittlerootTown_Text_1E8DA2: @ 81E8DA2 .string "Oh, yes. Do you still have the POKéDEX\n" .string "I gave you?\p" .string "I have something to show you.\n" - .string "Let’s go to my LAB.$" + .string "Let's go to my LAB.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 04cc1ad38..4413a80d5 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 lockall - msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1F783A applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_1F783A @@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x4082, 2 releaseall @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F7997 compare VAR_0x8008, 2 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79A2 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F90B4, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1F79C1 @@ -296,21 +296,21 @@ LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C .string "MOM: See, {PLAYER}?\n" - .string "Isn’t it nice in here, too?$" + .string "Isn't it nice in here, too?$" LittlerootTown_BrendansHouse_1F_Text_1F7A46: @ 81F7A46 - .string "The mover’s POKéMON do all the work\n" + .string "The mover's POKéMON do all the work\n" .string "of moving us in and cleaning up after.\l" .string "This is so convenient!\p" .string "{PLAYER}, your room is upstairs.\n" .string "Go check it out, dear!\p" .string "DAD bought you a new clock to mark\n" .string "our move here.\l" - .string "Don’t forget to set it!$" + .string "Don't forget to set it!$" LittlerootTown_BrendansHouse_1F_Text_1F7B24: @ 81F7B24 .string "MOM: Well, {PLAYER}?\p" - .string "Aren’t you interested in seeing your\n" + .string "Aren't you interested in seeing your\n" .string "very own room?$" LittlerootTown_BrendansHouse_1F_Text_1F7B67: @ 81F7B67 @@ -324,19 +324,19 @@ LittlerootTown_BrendansHouse_1F_Text_1F7B96: @ 81F7B96 LittlerootTown_BrendansHouse_1F_Text_1F7BBC: @ 81F7BBC LittlerootTown_MaysHouse_1F_Text_1F7BBC: @ 81F7BBC - .string "MOM: Look! It’s PETALBURG GYM!\n" + .string "MOM: Look! It's PETALBURG GYM!\n" .string "Maybe DAD will be on!$" LittlerootTown_BrendansHouse_1F_Text_1F7BF1: @ 81F7BF1 LittlerootTown_MaysHouse_1F_Text_1F7BF1: @ 81F7BF1 - .string "MOM: Oh… It’s over.\p" + .string "MOM: Oh… It's over.\p" .string "I think DAD was on, but we missed him.\n" .string "Too bad.$" LittlerootTown_BrendansHouse_1F_Text_1F7C35: @ 81F7C35 LittlerootTown_MaysHouse_1F_Text_1F7C35: @ 81F7C35 .string "Oh, yes.\n" - .string "One of DAD’s friends lives in town.\p" + .string "One of DAD's friends lives in town.\p" .string "PROF. BIRCH is his name.\p" .string "He lives right next door, so you should\n" .string "go over and introduce yourself.$" @@ -358,10 +358,10 @@ LittlerootTown_BrendansHouse_1F_Text_1F7D5C: @ 81F7D5C LittlerootTown_BrendansHouse_1F_Text_1F7D73: @ 81F7D73 .string "MOM: Oh? Did DAD give you that BADGE?\p" - .string "Then here’s something from your MOM!$" + .string "Then here's something from your MOM!$" LittlerootTown_BrendansHouse_1F_Text_1F7DBE: @ 81F7DBE - .string "Don’t push yourself too hard, dear.\n" + .string "Don't push yourself too hard, dear.\n" .string "You can always come home.\p" .string "Go for it, honey!$" @@ -393,7 +393,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F0F: @ 81F7F0F .string "Better get going!$" LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 - .string "It’s the instruction booklet for the\n" + .string "It's the instruction booklet for the\n" .string "RUNNING SHOES.\p" .string "“Press the B Button to run while\n" .string "wearing your RUNNING SHOES.\p" @@ -402,11 +402,11 @@ LittlerootTown_BrendansHouse_1F_Text_1F7F66: @ 81F7F66 LittlerootTown_BrendansHouse_1F_Text_1F800E: @ 81F800E .string "DAD: Hm?\p" - .string "Hey, it’s {PLAYER}!\p" - .string "It’s been a while since I saw you,\n" + .string "Hey, it's {PLAYER}!\p" + .string "It's been a while since I saw you,\n" .string "but you look…stronger, somehow.\p" - .string "That’s the impression I get.\n" - .string "But your old man hasn’t given up yet!\p" + .string "That's the impression I get.\n" + .string "But your old man hasn't given up yet!\p" .string "Oh, yes, I have something for you.\n" .string "This came to you from someone named\l" .string "MR. BRINEY.$" @@ -417,9 +417,9 @@ LittlerootTown_BrendansHouse_1F_Text_1F80FE: @ 81F80FE .string "SLATEPORT and LILYCOVE.$" LittlerootTown_BrendansHouse_1F_Text_1F815B: @ 81F815B - .string "I’d better get back to PETALBURG GYM.\p" + .string "I'd better get back to PETALBURG GYM.\p" .string "MOM, thanks for looking after the house\n" - .string "while I’m away.$" + .string "while I'm away.$" LittlerootTown_BrendansHouse_1F_Text_1F81B9: @ 81F81B9 .string "MOM: That DAD of yours…\p" @@ -447,5 +447,5 @@ LittlerootTown_BrendansHouse_1F_Text_1F8351: @ 81F8351 .string "that POKéMON was?$" LittlerootTown_BrendansHouse_1F_Text_1F83A1: @ 81F83A1 - .string "MOM: Well, isn’t that something!\n" + .string "MOM: Well, isn't that something!\n" .string "There are still unknown POKéMON.$" diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 54d386e26..2ebc9b900 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8481:: @ 81F8481 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8497 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -96,7 +96,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85CF applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C6 @@ -108,7 +108,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85E2 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85DB @@ -120,7 +120,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A8 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1F85F6 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85ED @@ -132,7 +132,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F8604 waitmovement 0 @@ -258,7 +258,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall @@ -272,18 +272,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F863F:: @ 81F863F end LittlerootTown_BrendansHouse_2F_EventScript_1F864C:: @ 81F864C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F8656:: @ 81F8656 LittlerootTown_MaysHouse_2F_EventScript_1F8656:: @ 81F8656 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F877F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_EventScript_1F865F:: @ 81F865F LittlerootTown_MaysHouse_2F_EventScript_1F865F:: @ 81F865F - msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, 3 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F884F, MSGBOX_SIGN end LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 @@ -293,12 +293,12 @@ LittlerootTown_BrendansHouse_2F_Text_1F8668: @ 81F8668 LittlerootTown_BrendansHouse_2F_Text_1F869A: @ 81F869A .string "MOM: {PLAYER}, how do you like your\n" .string "new room?\p" - .string "Good! Everything’s put away neatly!\p" + .string "Good! Everything's put away neatly!\p" .string "They finished moving everything in\n" .string "downstairs, too.\p" .string "POKéMON movers are so convenient!\p" .string "Oh, you should make sure that\n" - .string "everything’s all there on your desk.$" + .string "everything's all there on your desk.$" LittlerootTown_BrendansHouse_2F_Text_1F877F: @ 81F877F .string "{PLAYER} flipped open the notebook.\p" @@ -313,6 +313,6 @@ LittlerootTown_BrendansHouse_2F_Text_1F8820: @ 81F8820 .string "HOENN region map.$" LittlerootTown_BrendansHouse_2F_Text_1F884F: @ 81F884F - .string "It’s a Nintendo GameCube.\p" + .string "It's a Nintendo GameCube.\p" .string "A Game Boy Advance is connected to\n" .string "serve as the Controller.$" diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index d5348ef8a..824c4d930 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 lockall - msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F7B67, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1F898A applymovement 1, LittlerootTown_MaysHouse_1F_Movement_1F898A @@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC waitmovement 0 special GetRivalSonDaughterString - msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT setflag FLAG_0x057 setvar VAR_0x408C, 2 releaseall @@ -125,22 +125,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 compare VAR_0x408D, 3 goto_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F special GetRivalSonDaughterString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8CA5, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F:: @ 81F8A1F - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D37, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A29:: @ 81F8A29 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8D93, MSGBOX_DEFAULT release end LittlerootTown_BrendansHouse_1F_EventScript_1F8A33:: @ 81F8A33 - msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F8E01, MSGBOX_DEFAULT release end @@ -149,7 +149,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A3D:: @ 81F8A3D lock faceplayer special GetPlayerBigGuyGirlString - msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, 4 + msgbox LittlerootTown_BrendansHouse_1F_Text_1F9262, MSGBOX_DEFAULT release end @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B40 compare VAR_0x8008, 2 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B4B - msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, 4 + msgbox LittlerootTown_MaysHouse_1F_Text_1F8EC6, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1F8B6A @@ -338,7 +338,7 @@ LittlerootTown_MaysHouse_1F_Text_1F8BC5: @ 81F8BC5 .string "Oh, hello. And you are?\p" .string "… … … … … … … … …\n" .string "… … … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}, our new next-door\n" + .string "Oh, you're {PLAYER}{KUN}, our new next-door\n" .string "neighbor! Hi!\p" .string "We have a {STR_VAR_1} about the same\n" .string "age as you.\p" @@ -350,7 +350,7 @@ LittlerootTown_BrendansHouse_1F_Text_1F8CA5: @ 81F8CA5 .string "Like child, like father.\p" .string "My husband is as wild about POKéMON\n" .string "as our child.\p" - .string "If he’s not at his LAB, he’s likely\n" + .string "If he's not at his LAB, he's likely\n" .string "scrabbling about in grassy places.$" LittlerootTown_BrendansHouse_1F_Text_1F8D37: @ 81F8D37 @@ -363,14 +363,14 @@ LittlerootTown_BrendansHouse_1F_Text_1F8D93: @ 81F8D93 .string "Oh, {RIVAL} went out to ROUTE 103\n" .string "just a little while ago.\p" .string "Like father, like child.\n" - .string "{RIVAL} can’t stay quietly at home.$" + .string "{RIVAL} can't stay quietly at home.$" LittlerootTown_BrendansHouse_1F_Text_1F8E01: @ 81F8E01 - .string "I think it’s wonderful for people to\n" + .string "I think it's wonderful for people to\n" .string "travel with POKéMON.\p" .string "But you should go home every so often\n" - .string "to let your mother know you’re okay.\p" - .string "She might not say it, but I’m sure she\n" + .string "to let your mother know you're okay.\p" + .string "She might not say it, but I'm sure she\n" .string "worries about you, {PLAYER}{KUN}.$" LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 @@ -378,9 +378,9 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "Who… Who are you?\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "Oh, you're {PLAYER}{KUN}.\n" .string "So your move was today.\p" - .string "Um… I’m MAY.\n" + .string "Um… I'm MAY.\n" .string "Glad to meet you!\p" .string "I…\n" .string "I have this dream of becoming friends\l" @@ -389,31 +389,31 @@ LittlerootTown_MaysHouse_1F_Text_1F8EC6: @ 81F8EC6 .string "my dad, PROF. BIRCH.\p" .string "I was hoping that you would be nice,\n" .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Oh, this is silly, isn't it?\n" + .string "I… I've just met you, {PLAYER}{KUN}.\p" .string "Eheheh…\p" .string "Oh, no! I forgot!\p" .string "I was supposed to go help Dad catch\n" .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" + .string "{PLAYER}{KUN}, I'll catch you later!$" LittlerootTown_BrendansHouse_1F_Text_1F90B4: @ 81F90B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Oh, you're {PLAYER}, aren't you?\n" .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" + .string "I didn't know that you're a girl.\p" .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" + .string "next-door neighbor is a GYM LEADER's\l" + .string "kid, so I assumed you'd be a guy.\p" + .string "My name's BRENDAN.\n" .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "Huh? Hey, {PLAYER}, don't you have\n" .string "a POKéMON?\p" .string "Do you want me to go catch you one?\p" .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" + .string "I'm supposed to go help my dad catch\n" .string "some wild POKéMON.\p" .string "Some other time, okay?$" diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index 70e1c59d4..8a2ec10ac 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -59,7 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334 lockall compare VAR_0x408D, 2 goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A - msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT releaseall end @@ -97,7 +97,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9483 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9479 @@ -109,7 +109,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F9497 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948F @@ -121,7 +121,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94A4 waitmovement 0 @@ -132,7 +132,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_2F_Movement_2725A4 waitmovement 0 - msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, 4 + msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT closemessage applymovement 255, LittlerootTown_MaysHouse_2F_Movement_1F94BB applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94B2 @@ -260,12 +260,12 @@ LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 end LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F978A, MSGBOX_DEFAULT releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F94ED:: @ 81F94ED - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9962, MSGBOX_DEFAULT releaseall end @@ -284,21 +284,21 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F checkflag FLAG_0x125 goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F9541:: @ 81F9541 - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9A9E, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F954A:: @ 81F954A - msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, 4 + msgbox LittlerootTown_BrendansHouse_2F_Text_1F9BE7, MSGBOX_DEFAULT return EventScript_PlayerPCFemale:: @ 81F9553 @@ -311,7 +311,7 @@ EventScript_PlayerPCFemale:: @ 81F9553 end LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C - msgbox gUnknown_08272CD5, 4 + msgbox gUnknown_08272CD5, MSGBOX_DEFAULT releaseall end @@ -319,7 +319,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON - msgbox gUnknown_08272D87, 4 + msgbox gUnknown_08272D87, MSGBOX_DEFAULT special BedroomPC waitstate releaseall @@ -337,9 +337,9 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "Who… Who are you?\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" - .string "Oh, you’re {PLAYER}{KUN}.\n" + .string "Oh, you're {PLAYER}{KUN}.\n" .string "So your move was today.\p" - .string "Um… I’m MAY.\n" + .string "Um… I'm MAY.\n" .string "Glad to meet you!\p" .string "I…\n" .string "I have this dream of becoming friends\l" @@ -348,13 +348,13 @@ LittlerootTown_MaysHouse_2F_Text_1F959C: @ 81F959C .string "my dad, PROF. BIRCH.\p" .string "I was hoping that you would be nice,\n" .string "{PLAYER}{KUN}, and that we could be friends.\p" - .string "Oh, this is silly, isn’t it?\n" - .string "I… I’ve just met you, {PLAYER}{KUN}.\p" + .string "Oh, this is silly, isn't it?\n" + .string "I… I've just met you, {PLAYER}{KUN}.\p" .string "Eheheh…\p" .string "Oh, no! I forgot!\p" .string "I was supposed to go help Dad catch\n" .string "some wild POKéMON!\p" - .string "{PLAYER}{KUN}, I’ll catch you later!$" + .string "{PLAYER}{KUN}, I'll catch you later!$" LittlerootTown_BrendansHouse_2F_Text_1F978A: @ 81F978A .string "POKéMON fully restored!\n" @@ -364,19 +364,19 @@ LittlerootTown_BrendansHouse_2F_Text_1F97B4: @ 81F97B4 .string "Hey!\n" .string "You…\p" .string "Who are you?\p" - .string "Oh, you’re {PLAYER}, aren’t you?\n" + .string "Oh, you're {PLAYER}, aren't you?\n" .string "Moved in next door, right?\p" - .string "I didn’t know that you’re a girl.\p" + .string "I didn't know that you're a girl.\p" .string "Dad, PROF. BIRCH, said that our new\n" - .string "next-door neighbor is a GYM LEADER’s\l" - .string "kid, so I assumed you’d be a guy.\p" - .string "My name’s BRENDAN.\n" + .string "next-door neighbor is a GYM LEADER's\l" + .string "kid, so I assumed you'd be a guy.\p" + .string "My name's BRENDAN.\n" .string "So, hi, neighbor!\p" - .string "Huh? Hey, {PLAYER}, don’t you have\n" + .string "Huh? Hey, {PLAYER}, don't you have\n" .string "a POKéMON?\p" .string "Do you want me to go catch you one?\p" .string "Aw, darn, I forgot…\p" - .string "I’m supposed to go help my dad catch\n" + .string "I'm supposed to go help my dad catch\n" .string "some wild POKéMON.\p" .string "Some other time, okay?$" @@ -386,14 +386,14 @@ LittlerootTown_BrendansHouse_2F_Text_1F9962: @ 81F9962 LittlerootTown_BrendansHouse_2F_Text_1F9991: @ 81F9991 LittlerootTown_MaysHouse_2F_Text_1F9991: @ 81F9991 - .string "It’s {RIVAL}’s POKé BALL!\p" + .string "It's {RIVAL}'s POKé BALL!\p" .string "Better leave it right where it is.$" LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 .string "MAY: {PLAYER}{KUN}!\p" .string "I was just checking my POKéDEX.\p" - .string "There’s still a lot of POKéMON that\n" - .string "I’ve seen but haven’t caught.\p" + .string "There's still a lot of POKéMON that\n" + .string "I've seen but haven't caught.\p" .string "And there are many others that\n" .string "I think will evolve.\p" .string "I wonder where I should go catch\n" @@ -402,11 +402,11 @@ LittlerootTown_BrendansHouse_2F_Text_1F99C9: @ 81F99C9 LittlerootTown_BrendansHouse_2F_Text_1F9A9E: @ 81F9A9E .string "MAY: I wonder where I should go catch\n" .string "some POKéMON next?\p" - .string "Wouldn’t it be funny if we ran into each\n" + .string "Wouldn't it be funny if we ran into each\n" .string "other, {PLAYER}{KUN}?$" LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D - .string "BRENDAN: Hey, it’s {PLAYER}.\p" + .string "BRENDAN: Hey, it's {PLAYER}.\p" .string "I was just checking out my POKéDEX.\p" .string "There are still many POKéMON that\n" .string "I need to catch, I know, but this\l" @@ -415,8 +415,8 @@ LittlerootTown_BrendansHouse_2F_Text_1F9B0D: @ 81F9B0D .string "the urge to hit the road again.$" LittlerootTown_BrendansHouse_2F_Text_1F9BE7: @ 81F9BE7 - .string "BRENDAN: I’m having a hard time deciding\n" + .string "BRENDAN: I'm having a hard time deciding\n" .string "where I should catch POKéMON next.\p" - .string "Hey, {PLAYER}, if I see you while I’m out\n" + .string "Hey, {PLAYER}, if I see you while I'm out\n" .string "catching POKéMON, I can pitch you a\l" - .string "battle if you’d like.$" + .string "battle if you'd like.$" diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ae01e4632..ec6cd9738 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -98,7 +98,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8B1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07 compare VAR_RESULT, 0 @@ -112,7 +112,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E07:: @ 81F9E07 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA8F6, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -120,14 +120,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E17:: @ 81F9E17 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36:: @ 81F9E36 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA9D5, MSGBOX_DEFAULT clearflag FLAG_HIDE_ROUTE_101_BOY setvar VAR_0x4084, 3 releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E48:: @ 81F9E48 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA35, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9E36 compare VAR_RESULT, 0 @@ -154,7 +154,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 lockall delay 30 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB16D, MSGBOX_DEFAULT closemessage applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F46 waitmovement 0 @@ -183,14 +183,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_2725A6 waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_1FB436 waitmessage waitfanfare setflag FLAG_SYS_NATIONAL_DEX special EnableNationalPokedex - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL @@ -201,12 +201,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F32:: @ 81F9F32 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB30F, MSGBOX_DEFAULT closemessage return LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB38E, MSGBOX_DEFAULT closemessage return @@ -246,7 +246,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 lockall applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C waitmovement 0 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT setvar VAR_0x40D3, 5 releaseall end @@ -268,18 +268,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 checkflag FLAG_0x058 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT setflag FLAG_0x058 release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7:: @ 81F9FA7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA641, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA6CE, MSGBOX_DEFAULT release end @@ -290,7 +290,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CYNDAQUIL, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C @@ -303,7 +303,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_TOTODILE, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D @@ -316,20 +316,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_2725A8 waitmovement 0 drawmonpic SPECIES_CHIKORITA, 10, 3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, 5 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE end LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBAF8, MSGBOX_DEFAULT releaseall end LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT releaseall end @@ -348,7 +348,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -359,7 +359,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1:: @ 81FA0A1 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC:: @ 81FA0CC call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -373,7 +373,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -393,7 +393,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -404,7 +404,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA142:: @ 81FA142 LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D:: @ 81FA16D call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 5 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA193 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -418,7 +418,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193 LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -438,7 +438,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F call LittlerootTown_ProfessorBirchsLab_EventScript_27378B @@ -449,7 +449,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3:: @ 81FA1E3 LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E:: @ 81FA20E call LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F removeobject 6 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA234 call LittlerootTown_ProfessorBirchsLab_EventScript_273797 @@ -463,7 +463,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234 LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F erasemonpic - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT setvar VAR_0x40D3, 6 releaseall end @@ -490,12 +490,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A:: @ 81FA28A - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB787, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB466, MSGBOX_DEFAULT release end @@ -508,17 +508,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_272141 compare VAR_0x4084, 5 goto_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 Route101_EventScript_1FA2D2:: @ 81FA2D2 - msgbox Route101_Text_2B5F52, 4 + msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route101_Text_2B603A, 4 + msgbox Route101_Text_2B603A, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -528,9 +528,9 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAB22, MSGBOX_DEFAULT call LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAC4B, MSGBOX_DEFAULT closemessage applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 waitmovement 0 @@ -550,20 +550,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA352:: @ 81FA352 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FADD7, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAE40, MSGBOX_DEFAULT setvar VAR_RESULT, 0 return LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F:: @ 81FA37F - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF3F, MSGBOX_DEFAULT giveitem_std ITEM_POKE_BALL, 5 compare VAR_RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF8E, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -578,16 +578,16 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4:: @ 81FA3C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAD6F, MSGBOX_DEFAULT release end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3CE:: @ 81FA3CE - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAEF3, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB05D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 @@ -596,7 +596,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0A2, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC @@ -617,11 +617,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC end LittlerootTown_ProfessorBirchsLab_EventScript_1FA428:: @ 81FA428 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAF08, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA431:: @ 81FA431 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB073, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A @@ -634,11 +634,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A:: @ 81FA43A end LittlerootTown_ProfessorBirchsLab_EventScript_1FA453:: @ 81FA453 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBB68, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA45C:: @ 81FA45C - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC2D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 @@ -651,11 +651,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA465:: @ 81FA465 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA47E:: @ 81FA47E - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBC8D, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA487:: @ 81FA487 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBCD2, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 @@ -668,23 +668,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA490:: @ 81FA490 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4A9:: @ 81FA4A9 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB528, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4B2:: @ 81FA4B2 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, 4 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB58A, MSGBOX_DEFAULT return LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB:: @ 81FA4BB - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB0E7, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4:: @ 81FA4C4 - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB124, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD:: @ 81FA4CD - msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, 3 + msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB148, MSGBOX_SIGN end LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 @@ -697,55 +697,55 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 LittlerootTown_ProfessorBirchsLab_Text_1FA4E2: @ 81FA4E2 .string "Hunh? PROF. BIRCH?\p" - .string "The PROF’s away on fieldwork.\n" - .string "Ergo, he isn’t here.\p" + .string "The PROF's away on fieldwork.\n" + .string "Ergo, he isn't here.\p" .string "Oh, let me explain what fieldwork is.\p" .string "It is to study things in the natural\n" .string "environment, like fields and mountains,\l" .string "instead of a laboratory.\p" - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" + .string "The PROF isn't one for doing desk work.\n" + .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_1FA641: @ 81FA641 - .string "The PROF isn’t one for doing desk work.\n" - .string "He’s the type of person who would\l" + .string "The PROF isn't one for doing desk work.\n" + .string "He's the type of person who would\l" .string "rather go outside and experience\l" .string "things than read about them here.$" LittlerootTown_ProfessorBirchsLab_Text_1FA6CE: @ 81FA6CE .string "PROF. BIRCH is studying the habitats\n" .string "and distribution of POKéMON.\p" - .string "The PROF enjoys {RIVAL}’s help, too.\n" - .string "There’s a lot of love there.$" + .string "The PROF enjoys {RIVAL}'s help, too.\n" + .string "There's a lot of love there.$" LittlerootTown_ProfessorBirchsLab_Text_1FA74D: @ 81FA74D .string "PROF. BIRCH: So, {PLAYER}{KUN}.\p" - .string "I’ve heard so much about you from\n" + .string "I've heard so much about you from\n" .string "your father.\p" - .string "I’ve heard that you don’t have your\n" + .string "I've heard that you don't have your\n" .string "own POKéMON yet.\p" .string "But the way you battled earlier,\n" .string "you pulled it off with aplomb!\p" - .string "I guess you have your father’s blood\n" + .string "I guess you have your father's blood\n" .string "in your veins after all!\p" .string "Oh, yes. As thanks for rescuing me,\n" - .string "I’d like you to have the POKéMON you\l" + .string "I'd like you to have the POKéMON you\l" .string "used earlier.\p" .string "{PLAYER} received the {STR_VAR_1}!$" LittlerootTown_ProfessorBirchsLab_Text_1FA8B1: @ 81FA8B1 - .string "PROF. BIRCH: While you’re at it, why not\n" + .string "PROF. BIRCH: While you're at it, why not\n" .string "give a nickname to that {STR_VAR_1}?$" LittlerootTown_ProfessorBirchsLab_Text_1FA8F6: @ 81FA8F6 .string "PROF. BIRCH: If you work at POKéMON\n" - .string "and gain experience, I think you’ll make\l" + .string "and gain experience, I think you'll make\l" .string "an extremely good TRAINER.\p" .string "My kid, {RIVAL}, is also studying\n" .string "POKéMON while helping me out.\p" - .string "{PLAYER}{KUN}, don’t you think it might be\n" + .string "{PLAYER}{KUN}, don't you think it might be\n" .string "a good idea to go see {RIVAL}?$" LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 @@ -755,13 +755,13 @@ LittlerootTown_ProfessorBirchsLab_Text_1FA9D5: @ 81FA9D5 .string "means to be a TRAINER.$" LittlerootTown_ProfessorBirchsLab_Text_1FAA35: @ 81FAA35 - .string "PROF. BIRCH: Oh, don’t be that way.\n" + .string "PROF. BIRCH: Oh, don't be that way.\n" .string "You should go meet my kid.$" LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 .string "PROF. BIRCH: {RIVAL}?\n" .string "Gone home, I think.\p" - .string "Or maybe that kid’s scrabbling around\n" + .string "Or maybe that kid's scrabbling around\n" .string "in tall grass again somewhere…\p" .string "If you or your POKéMON get tired,\n" .string "you should get some rest at home.$" @@ -769,8 +769,8 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAA74: @ 81FAA74 LittlerootTown_ProfessorBirchsLab_Text_1FAB22: @ 81FAB22 .string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p" .string "I heard you beat {RIVAL} on\n" - .string "your first try. That’s excellent!\p" - .string "{RIVAL}’s been helping with my research\n" + .string "your first try. That's excellent!\p" + .string "{RIVAL}'s been helping with my research\n" .string "for a long time.\p" .string "{RIVAL} has an extensive history as\n" .string "a TRAINER already.\p" @@ -789,31 +789,31 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAC4B: @ 81FAC4B .string "with it.\p" .string "Whenever my kid catches a rare POKéMON\n" .string "and records its data in the POKéDEX,\l" - .string "why, {RIVAL} looks for me while I’m out\l" + .string "why, {RIVAL} looks for me while I'm out\l" .string "doing fieldwork, and shows me.$" LittlerootTown_ProfessorBirchsLab_Text_1FAD6F: @ 81FAD6F .string "PROF. BIRCH: Countless POKéMON\n" .string "await you!\p" - .string "Argh, I’m getting the itch to get out\n" + .string "Argh, I'm getting the itch to get out\n" .string "and do fieldwork again!$" LittlerootTown_ProfessorBirchsLab_Text_1FADD7: @ 81FADD7 .string "MAY: Oh, wow, {PLAYER}{KUN}!\n" .string "You got a POKéDEX, too!\p" - .string "That’s great! Just like me!\n" - .string "I’ve got something for you, too!$" + .string "That's great! Just like me!\n" + .string "I've got something for you, too!$" LittlerootTown_ProfessorBirchsLab_Text_1FAE40: @ 81FAE40 - .string "MAY: It’s fun if you can get a lot of\n" + .string "MAY: It's fun if you can get a lot of\n" .string "POKéMON!\p" - .string "I’m going to look all over the place\n" + .string "I'm going to look all over the place\n" .string "because I want different POKéMON.\p" - .string "If I find any cute POKéMON, I’ll catch\n" + .string "If I find any cute POKéMON, I'll catch\n" .string "them with POKé BALLS!$" LittlerootTown_ProfessorBirchsLab_Text_1FAEF3: @ 81FAEF3 - .string "Oh? Your BAG’s full.$" + .string "Oh? Your BAG's full.$" LittlerootTown_ProfessorBirchsLab_Text_1FAF08: @ 81FAF08 .string "MAY: I wonder where I should go look\n" @@ -823,40 +823,40 @@ LittlerootTown_ProfessorBirchsLab_Text_1FAF3F: @ 81FAF3F .string "BRENDAN: Huh…\n" .string "So you got a POKéDEX, too.\p" .string "Well then, here.\n" - .string "I’ll give you these.$" + .string "I'll give you these.$" LittlerootTown_ProfessorBirchsLab_Text_1FAF8E: @ 81FAF8E - .string "BRENDAN: You know it’s more fun to\n" + .string "BRENDAN: You know it's more fun to\n" .string "have a whole bunch of POKéMON.\p" - .string "I’m going to explore all over the place\n" + .string "I'm going to explore all over the place\n" .string "to find different POKéMON.\p" .string "If I find any cool POKéMON, you bet\n" - .string "I’ll try to get them with POKé BALLS.$" + .string "I'll try to get them with POKé BALLS.$" LittlerootTown_ProfessorBirchsLab_Text_1FB05D: @ 81FB05D - .string "Hey, your BAG’s full.$" + .string "Hey, your BAG's full.$" LittlerootTown_ProfessorBirchsLab_Text_1FB073: @ 81FB073 .string "BRENDAN: Where should I look for\n" .string "POKéMON next…$" LittlerootTown_ProfessorBirchsLab_Text_1FB0A2: @ 81FB0A2 - .string "It’s a serious-looking machine.\n" + .string "It's a serious-looking machine.\n" .string "The PROF must use this for research.$" LittlerootTown_ProfessorBirchsLab_Text_1FB0E7: @ 81FB0E7 - .string "It’s a PC used for research.\n" + .string "It's a PC used for research.\n" .string "Better not mess around with it.$" LittlerootTown_ProfessorBirchsLab_Text_1FB124: @ 81FB124 - .string "It’s crammed with books on POKéMON.$" + .string "It's crammed with books on POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FB148: @ 81FB148 - .string "It’s a book that’s too hard to read.$" + .string "It's a book that's too hard to read.$" LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "PROF. BIRCH: Now…\p" - .string "{PLAYER}{KUN} and {RIVAL}, I’ve had the two\n" + .string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n" .string "of you help me study POKéMON.\p" .string "Thanks to your help, new facts\n" .string "are coming to light.\p" @@ -866,16 +866,16 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB16D: @ 81FB16D .string "It goes to show how rich and varied\n" .string "the natural environments of HOENN\l" .string "happen to be.\p" - .string "That’s why I think it’s necessary for\n" + .string "That's why I think it's necessary for\n" .string "me to upgrade your POKéDEX to\l" .string "the NATIONAL Mode.\p" .string "Here, let me see your POKéDEX units.$" LittlerootTown_ProfessorBirchsLab_Text_1FB30F: @ 81FB30F .string "MAY: Eheheh!\p" - .string "It’s so cool that even my POKéDEX\n" + .string "It's so cool that even my POKéDEX\n" .string "is getting updated!\p" - .string "It’s because you went out and caught\n" + .string "It's because you went out and caught\n" .string "so many POKéMON, {PLAYER}{KUN}!$" LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E @@ -883,48 +883,48 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB38E: @ 81FB38E .string "and checked out POKéMON.\p" .string "You can thank me for getting\n" .string "the NATIONAL Mode POKéDEX.\p" - .string "Yep, you’re lucky, {PLAYER}!$" + .string "Yep, you're lucky, {PLAYER}!$" LittlerootTown_ProfessorBirchsLab_Text_1FB419: @ 81FB419 .string "PROF. BIRCH: Okay, all done!$" LittlerootTown_ProfessorBirchsLab_Text_1FB436: @ 81FB436 - .string "{PLAYER}’s POKéDEX was upgraded\n" + .string "{PLAYER}'s POKéDEX was upgraded\n" .string "to the NATIONAL Mode!$" LittlerootTown_ProfessorBirchsLab_Text_1FB466: @ 81FB466 .string "PROF. BIRCH: But listen.\n" - .string "You’ve become the CHAMPION,\l" - .string "but your POKéMON journey isn’t over.\p" + .string "You've become the CHAMPION,\l" + .string "but your POKéMON journey isn't over.\p" .string "There is no end to the road\n" .string "that is POKéMON.\p" .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" + .string "that's waiting for you!$" LittlerootTown_ProfessorBirchsLab_Text_1FB528: @ 81FB528 - .string "MAY: I think I’ll take a short break\n" + .string "MAY: I think I'll take a short break\n" .string "from fieldwork.\p" - .string "I think I’ll help the PROF here for\n" + .string "I think I'll help the PROF here for\n" .string "a while.$" LittlerootTown_ProfessorBirchsLab_Text_1FB58A: @ 81FB58A .string "BRENDAN: For the time being,\n" - .string "I’m taking a break from fieldwork.\p" - .string "I’ll be helping out the PROF here\n" + .string "I'm taking a break from fieldwork.\p" + .string "I'll be helping out the PROF here\n" .string "for a while.$" LittlerootTown_ProfessorBirchsLab_Text_1FB5F9: @ 81FB5F9 .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" - .string "Let’s have a look at your POKéDEX.\p" + .string "Let's have a look at your POKéDEX.\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "Yes, there’s no doubt about it.\p" + .string "Yes, there's no doubt about it.\p" .string "You really have completed the HOENN\n" - .string "region’s POKéDEX.\p" - .string "That’s more than just impressive.\p" + .string "region's POKéDEX.\p" + .string "That's more than just impressive.\p" .string "I have a gift for you.\p" .string "Consider it my show of appreciation\n" - .string "for the fantastic work you’ve done.\p" + .string "for the fantastic work you've done.\p" .string "My gift is a rare POKéMON only found\n" .string "in another region!\p" .string "You can have any one of these\n" @@ -939,25 +939,25 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB787: @ 81FB787 LittlerootTown_ProfessorBirchsLab_Text_1FB7F6: @ 81FB7F6 .string "PROF. BIRCH: The FIRE POKéMON\n" .string "CYNDAQUIL caught your eye!\p" - .string "You’re as sharp as ever!\p" + .string "You're as sharp as ever!\p" .string "So the CYNDAQUIL is your choice?$" LittlerootTown_ProfessorBirchsLab_Text_1FB869: @ 81FB869 .string "PROF. BIRCH: The WATER POKéMON\n" .string "TOTODILE is your choice!\p" .string "You know how to pick a good one.\p" - .string "So, you’ll take the TOTODILE?$" + .string "So, you'll take the TOTODILE?$" LittlerootTown_ProfessorBirchsLab_Text_1FB8E0: @ 81FB8E0 .string "PROF. BIRCH: The GRASS POKéMON\n" .string "CHIKORITA is your choice!\p" - .string "You sure know what you’re doing.\p" - .string "So, you’ll take the CHIKORITA?$" + .string "You sure know what you're doing.\p" + .string "So, you'll take the CHIKORITA?$" LittlerootTown_ProfessorBirchsLab_Text_1FB959: @ 81FB959 .string "PROF. BIRCH: Take your time before\n" .string "you decide.\p" - .string "They’re all invaluable POKéMON.$" + .string "They're all invaluable POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FB9A8: @ 81FB9A8 .string "PROF. BIRCH: I see!\n" @@ -973,19 +973,19 @@ LittlerootTown_ProfessorBirchsLab_Text_1FB9FC: @ 81FB9FC LittlerootTown_ProfessorBirchsLab_Text_1FBA2C: @ 81FBA2C .string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n" - .string "You’ve completed the HOENN POKéDEX,\l" - .string "but your POKéMON journey isn’t over.\p" + .string "You've completed the HOENN POKéDEX,\l" + .string "but your POKéMON journey isn't over.\p" .string "There is no end to the road\n" .string "that is POKéMON.\p" .string "Somewhere, there is a grassy patch\n" - .string "that’s waiting for you!$" + .string "that's waiting for you!$" LittlerootTown_ProfessorBirchsLab_Text_1FBAF8: @ 81FBAF8 .string "You received the promised POKéMON.\n" .string "Better leave the others alone.$" LittlerootTown_ProfessorBirchsLab_Text_1FBB3A: @ 81FBB3A - .string "Oh, you don’t have any room for\n" + .string "Oh, you don't have any room for\n" .string "this POKéMON.$" LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 @@ -995,7 +995,7 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBB68: @ 81FBB68 .string "and sharpening your skills?\p" .string "Or are you going to try filling\n" .string "the NATIONAL POKéDEX?\p" - .string "I’m staying here to help the PROF.$" + .string "I'm staying here to help the PROF.$" LittlerootTown_ProfessorBirchsLab_Text_1FBC2D: @ 81FBC2D .string "BRENDAN: Rather than collecting\n" @@ -1016,15 +1016,15 @@ LittlerootTown_ProfessorBirchsLab_Text_1FBD1A: @ 81FBD1A .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "SCOTT: Hi, hi, {PLAYER}!\n" - .string "It’s me, SCOTT.\p" - .string "I’m aboard the S.S. TIDAL now.\n" + .string "It's me, SCOTT.\p" + .string "I'm aboard the S.S. TIDAL now.\n" .string "It feels great to be on the sea!\p" .string "By the way…\p" - .string "There’s this place that I’d like to\n" + .string "There's this place that I'd like to\n" .string "invite you to for a visit.\p" - .string "If you’re interested, board a ferry\n" + .string "If you're interested, board a ferry\n" .string "at either SLATEPORT or LILYCOVE.\p" - .string "I’ll fill you in on the details when\n" - .string "we meet. I’ll be waiting!\p" + .string "I'll fill you in on the details when\n" + .string "we meet. I'll be waiting!\p" .string "… … … … … …\n" .string "… … … … … Click!$" diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 0e133a890..56ad204a9 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -7,29 +7,29 @@ MagmaHideout_1F_MapScript1_239886: @ 8239886 end MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle 0, TRAINER_GRUNT_38, 0, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, 6 + trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 + msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE end MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle 0, TRAINER_GRUNT_39, 0, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, 6 + trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA + msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE end MagmaHideout_1F_Text_2398BA: @ 82398BA .string "When TEAM MAGMA has roll call, we get\n" .string "important guarding assignments in\l" .string "the order that we line up.\p" - .string "That’s why I’m stuck off in this corner.\n" - .string "I’m always late to roll call!$" + .string "That's why I'm stuck off in this corner.\n" + .string "I'm always late to roll call!$" MagmaHideout_1F_Text_239964: @ 8239964 - .string "I’m always late for training sessions,\n" + .string "I'm always late for training sessions,\n" .string "too!\p" - .string "I hate to say it, but I’m wimpy…$" + .string "I hate to say it, but I'm wimpy…$" MagmaHideout_1F_Text_2399B1: @ 82399B1 - .string "Okay, I’ll try to put a little more\n" + .string "Okay, I'll try to put a little more\n" .string "effort into things from now on…$" MagmaHideout_1F_Text_2399F5: @ 82399F5 @@ -39,15 +39,15 @@ MagmaHideout_1F_Text_2399F5: @ 82399F5 .string "across something that blew our minds!\p" .string "What did we find?\p" .string "Fuhahaha!\n" - .string "I’ll tell you if you beat me!$" + .string "I'll tell you if you beat me!$" MagmaHideout_1F_Text_239ABA: @ 8239ABA .string "Arrgh!\n" .string "Taken down!$" MagmaHideout_1F_Text_239ACD: @ 8239ACD - .string "I won’t tell you after all.\n" - .string "You’ll find out when you get there!\p" - .string "It’d be better if you saved surprises\n" - .string "to the end, don’t you think?$" + .string "I won't tell you after all.\n" + .string "You'll find out when you get there!\p" + .string "It'd be better if you saved surprises\n" + .string "to the end, don't you think?$" diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 33252bb57..9ea2ef6fe 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -2,30 +2,30 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle 0, TRAINER_GRUNT_51, 0, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, 6 + trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B + msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle 0, TRAINER_GRUNT_40, 0, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, 6 + trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 + msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle 0, TRAINER_GRUNT_41, 0, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, 6 + trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 + msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle 0, TRAINER_GRUNT_42, 0, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, 6 + trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA + msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE end MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD .string "What, what, what?\p" .string "Only TEAM MAGMA members are supposed\n" .string "to be in here!\p" - .string "But you’re not dressed in TEAM MAGMA’s\n" + .string "But you're not dressed in TEAM MAGMA's\n" .string "uniform…\p" .string "You rouse my suspicion!\n" .string "Battle with me!$" @@ -40,7 +40,7 @@ MagmaHideout_2F_1R_Text_239C74: @ 8239C74 MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB .string "Hold it right there!\p" - .string "You don’t really expect me to keep\n" + .string "You don't really expect me to keep\n" .string "my trap shut and let you waltz by me?$" MagmaHideout_2F_1R_Text_239D09: @ 8239D09 @@ -48,7 +48,7 @@ MagmaHideout_2F_1R_Text_239D09: @ 8239D09 .string "I concede!$" MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D - .string "Maybe it would’ve been better if I did\n" + .string "Maybe it would've been better if I did\n" .string "just let you go unchallenged…$" MagmaHideout_2F_1R_Text_239D62: @ 8239D62 @@ -59,7 +59,7 @@ MagmaHideout_2F_1R_Text_239D75: @ 8239D75 .string "Graaah!$" MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D - .string "I’ve already lost.\p" + .string "I've already lost.\p" .string "Do I really need to keep running\n" .string "around in a circle?$" @@ -71,5 +71,5 @@ MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA .string "Mutter…$" MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 - .string "Actually, I’m no expert at battling…$" + .string "Actually, I'm no expert at battling…$" diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 8b1e51f16..5539d26de 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -2,28 +2,28 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle 0, TRAINER_GRUNT_52, 0, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, 6 + trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 + msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle 0, TRAINER_GRUNT_43, 0, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, 6 + trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 + msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle 0, TRAINER_GRUNT_44, 0, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, 6 + trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 + msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle 0, TRAINER_GRUNT_45, 0, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, 6 + trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C + msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE end MagmaHideout_2F_2R_Text_239E64: @ 8239E64 - .string "I don’t have a bone to pick with you.\n" - .string "I’m just following orders!$" + .string "I don't have a bone to pick with you.\n" + .string "I'm just following orders!$" MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 .string "I may have lost, but…$" @@ -31,11 +31,11 @@ MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB .string "We dug up something beyond belief!\n" .string "And, we got the BLUE ORB!\p" - .string "All that’s left is for our leader to…\n" + .string "All that's left is for our leader to…\n" .string "Fufufu… Fwahahaha!$" MagmaHideout_2F_2R_Text_239F31: @ 8239F31 - .string "I can’t stand heat. Maybe I should’ve\n" + .string "I can't stand heat. Maybe I should've\n" .string "joined TEAM AQUA instead…$" MagmaHideout_2F_2R_Text_239F71: @ 8239F71 @@ -43,7 +43,7 @@ MagmaHideout_2F_2R_Text_239F71: @ 8239F71 .string "TEAM MAGMA…$" MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 - .string "Don’t you get lonely for the sea\n" + .string "Don't you get lonely for the sea\n" .string "being in a place like this?$" MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE @@ -54,13 +54,13 @@ MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE .string "No, no, never mind!$" MagmaHideout_2F_2R_Text_23A050: @ 823A050 - .string "You’re a fiery battler.\n" + .string "You're a fiery battler.\n" .string "Just like a volcano!$" MagmaHideout_2F_2R_Text_23A07D: @ 823A07D .string "You just happened to win this time,\n" - .string "but that doesn’t matter.\p" - .string "TEAM MAGMA’s goal is about to be\n" + .string "but that doesn't matter.\p" + .string "TEAM MAGMA's goal is about to be\n" .string "reached!$" MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 @@ -70,9 +70,9 @@ MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 .string "Was it you who found it?$" MagmaHideout_2F_2R_Text_23A14C: @ 823A14C - .string "I’m having trouble believing this…$" + .string "I'm having trouble believing this…$" MagmaHideout_2F_2R_Text_23A16F: @ 823A16F - .string "I’m getting this feeling that our plan\n" + .string "I'm getting this feeling that our plan\n" .string "is going to end in failure…$" diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 068e71492..879cd282d 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -2,13 +2,13 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle 0, TRAINER_GRUNT_46, 0, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, 6 + trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 + msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle 0, TRAINER_GRUNT_53, 0, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, 6 + trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 + msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE end MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 @@ -17,27 +17,27 @@ MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 .string "My left ear is burning up!$" MagmaHideout_3F_1R_Text_23A229: @ 823A229 - .string "I’m getting heat exhaustion…$" + .string "I'm getting heat exhaustion…$" MagmaHideout_3F_1R_Text_23A246: @ 823A246 - .string "Do you think it’s odd that we’re wearing\n" + .string "Do you think it's odd that we're wearing\n" .string "hoods in this magma-filled volcano?$" MagmaHideout_3F_1R_Text_23A293: @ 823A293 .string "We joined so we can help our leader\n" .string "achieve his fantastic vision.\p" - .string "I don’t care if you’re with TEAM AQUA\n" - .string "or if you’re just some kid passing by.\p" + .string "I don't care if you're with TEAM AQUA\n" + .string "or if you're just some kid passing by.\p" .string "No one interferes with us and gets\n" .string "away with it!$" MagmaHideout_3F_1R_Text_23A353: @ 823A353 .string "Oh, no!\n" - .string "You’re not to be trusted at all!$" + .string "You're not to be trusted at all!$" MagmaHideout_3F_1R_Text_23A37C: @ 823A37C .string "Listen to me.\n" .string "TEAM MAGMA is right!\p" - .string "Don’t listen to TEAM AQUA.\n" - .string "Don’t believe their lies!$" + .string "Don't listen to TEAM AQUA.\n" + .string "Don't believe their lies!$" diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 15d0c26ea..14f7001fa 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -2,8 +2,8 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle 0, TRAINER_GRUNT_47, 0, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, 6 + trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB + msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE end MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC @@ -11,8 +11,8 @@ MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC .string "says. But you know what?\p" .string "Doing stuff like digging up a super-\n" .string "ancient POKéMON and ripping off\l" - .string "someone’s METEORITE…\p" - .string "I think we’re going a little too far.\n" + .string "someone's METEORITE…\p" + .string "I think we're going a little too far.\n" .string "What do you think?$" MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB @@ -22,5 +22,5 @@ MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF .string "You know, losing to you cleared my mind.\p" .string "The next time I see our leader,\n" - .string "I’m going to ask him about what we do.$" + .string "I'm going to ask him about what we do.$" diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index b2a28639f..714983999 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -4,7 +4,7 @@ MagmaHideout_4F_MapScripts:: @ 823A55F MagmaHideout_4F_EventScript_23A560:: @ 823A560 lockall playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, 4 + msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 @@ -48,17 +48,17 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 delay 30 applymovement 6, MagmaHideout_4F_Movement_23A680 waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, 4 + msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT closemessage applymovement 255, MagmaHideout_4F_Movement_2725A8 waitmovement 0 delay 30 applymovement 6, MagmaHideout_4F_Movement_27259E waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, 4 + msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT closemessage - trainerbattle 3, TRAINER_MAXIE_1, 0, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, 4 + trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5 + msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY @@ -109,35 +109,35 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle 0, TRAINER_GRUNT_48, 0, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, 6 + trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 + msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle 0, TRAINER_GRUNT_49, 0, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, 6 + trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B + msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle 0, TRAINER_GRUNT_50, 0, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, 6 + trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 + msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE end MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle 0, TRAINER_TABITHA_3, 0, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, 6 + trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 + msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE end MagmaHideout_4F_Text_23A6E8: @ 823A6E8 .string "I want to see GROUDON, too, but they\n" - .string "won’t let me see even its tail…\p" - .string "It’s got me feeling really frustrated.\p" + .string "won't let me see even its tail…\p" + .string "It's got me feeling really frustrated.\p" .string "Oh, no!\n" .string "I blabbed about GROUDON!$" MagmaHideout_4F_Text_23A775: @ 823A775 - .string "I guess it’s impossible to win if one\n" - .string "doesn’t have a calm mind…$" + .string "I guess it's impossible to win if one\n" + .string "doesn't have a calm mind…$" MagmaHideout_4F_Text_23A7B5: @ 823A7B5 .string "I wonder if GROUDON even has a tail?$" @@ -149,15 +149,15 @@ MagmaHideout_4F_Text_23A7DA: @ 823A7DA MagmaHideout_4F_Text_23A81B: @ 823A81B .string "Grrr…\n" - .string "I’ve come so far, but now this?$" + .string "I've come so far, but now this?$" MagmaHideout_4F_Text_23A841: @ 823A841 .string "MAXIE, sir!\n" .string "An intruder is headed your way!$" MagmaHideout_4F_Text_23A86D: @ 823A86D - .string "You’re not finished yet!\n" - .string "You’re not getting by me easily!$" + .string "You're not finished yet!\n" + .string "You're not getting by me easily!$" MagmaHideout_4F_Text_23A8A7: @ 823A8A7 .string "Was I that easy to knock down?$" @@ -167,12 +167,12 @@ MagmaHideout_4F_Text_23A8C6: @ 823A8C6 MagmaHideout_4F_Text_23A8E1: @ 823A8E1 .string "Hehehe!\n" - .string "You made it this far, so I’ll tell you!\p" - .string "That’s right!\n" + .string "You made it this far, so I'll tell you!\p" + .string "That's right!\n" .string "Up ahead, GROUDON is sleeping!\p" .string "MAXIE went to GROUDON just seconds\n" .string "ago!\p" - .string "It’s going to awaken real soon!\n" + .string "It's going to awaken real soon!\n" .string "Hehe! Hehehe!$" MagmaHideout_4F_Text_23A994: @ 823A994 @@ -188,7 +188,7 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 .string "Nothing could awaken you from your\n" .string "sleep bathed in magma…\p" .string "This BLUE ORB is what you sought.\n" - .string "Wasn’t it?\p" + .string "Wasn't it?\p" .string "I have brought you the BLUE ORB.\n" .string "Let its shine awaken you!\p" .string "And show me…\n" @@ -196,14 +196,14 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 MagmaHideout_4F_Text_23AADA: @ 823AADA .string "MAXIE: GROUDON!\n" - .string "What’s wrong?\p" - .string "Wasn’t the BLUE ORB the key?\p" + .string "What's wrong?\p" + .string "Wasn't the BLUE ORB the key?\p" .string "GROUDON!\n" .string "Where have you gone…$" MagmaHideout_4F_Text_23AB33: @ 823AB33 .string "MAXIE: Oh, so it was you?\p" - .string "I’ve seen you poking around uninvited\n" + .string "I've seen you poking around uninvited\n" .string "here and there…\p" .string "I get it now!\n" .string "You must have pulled a cheap stunt!$" @@ -215,12 +215,12 @@ MagmaHideout_4F_Text_23ABB5: @ 823ABB5 MagmaHideout_4F_Text_23ABE2: @ 823ABE2 .string "MAXIE: There has to be some reason\n" .string "why GROUDON fled…\p" - .string "That’s what you’re trying to say,\n" - .string "aren’t you?\p" + .string "That's what you're trying to say,\n" + .string "aren't you?\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "Humph…\n" - .string "You think I didn’t know that?\p" + .string "You think I didn't know that?\p" .string "With GROUDON gone, there is no longer\n" .string "any need for this blasted volcano.\p" .string "I am going after GROUDON, so this\n" diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index ed5163cf1..17ace6e10 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -20,35 +20,35 @@ MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9 return MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3 - msgbox MauvilleCity_Text_1E0301, 2 + msgbox MauvilleCity_Text_1E0301, MSGBOX_NPC end MauvilleCity_EventScript_1DF3BC:: @ 81DF3BC - msgbox MauvilleCity_Text_1E037C, 2 + msgbox MauvilleCity_Text_1E037C, MSGBOX_NPC end MauvilleCity_EventScript_1DF3C5:: @ 81DF3C5 - msgbox MauvilleCity_Text_1E03FB, 2 + msgbox MauvilleCity_Text_1E03FB, MSGBOX_NPC end MauvilleCity_EventScript_1DF3CE:: @ 81DF3CE - msgbox MauvilleCity_Text_1E044A, 2 + msgbox MauvilleCity_Text_1E044A, MSGBOX_NPC end MauvilleCity_EventScript_1DF3D7:: @ 81DF3D7 - msgbox MauvilleCity_Text_1E0485, 3 + msgbox MauvilleCity_Text_1E0485, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E0:: @ 81DF3E0 - msgbox MauvilleCity_Text_1E04B7, 3 + msgbox MauvilleCity_Text_1E04B7, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3E9:: @ 81DF3E9 - msgbox MauvilleCity_Text_1E0504, 3 + msgbox MauvilleCity_Text_1E0504, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 - msgbox MauvilleCity_Text_1E053C, 3 + msgbox MauvilleCity_Text_1E053C, MSGBOX_SIGN end MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB @@ -56,13 +56,13 @@ MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB faceplayer checkflag FLAG_0x062 goto_eq MauvilleCity_EventScript_1DF413 - msgbox MauvilleCity_Text_1E056A, 4 + msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT setflag FLAG_0x062 release end MauvilleCity_EventScript_1DF413:: @ 81DF413 - msgbox MauvilleCity_Text_1E0699, 4 + msgbox MauvilleCity_Text_1E0699, MSGBOX_DEFAULT release end @@ -71,7 +71,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D faceplayer checkflag FLAG_0x11C goto_eq MauvilleCity_EventScript_1DF43D - msgbox MauvilleCity_Text_1DF7DC, 4 + msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -79,7 +79,7 @@ MauvilleCity_EventScript_1DF41D:: @ 81DF41D end MauvilleCity_EventScript_1DF43D:: @ 81DF43D - msgbox MauvilleCity_Text_1DFAA5, 4 + msgbox MauvilleCity_Text_1DFAA5, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 waitmovement 0 @@ -92,9 +92,9 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 goto_eq MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DF845, 4 - msgbox MauvilleCity_Text_1DF8B9, 4 - msgbox MauvilleCity_Text_1DF963, 4 + msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT + msgbox MauvilleCity_Text_1DF963, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 playse SE_PIN @@ -102,7 +102,7 @@ MauvilleCity_EventScript_1DF452:: @ 81DF452 waitmovement 0 applymovement 6, MauvilleCity_Movement_27259A waitmovement 0 - msgbox MauvilleCity_Text_1DF9B2, 5 + msgbox MauvilleCity_Text_1DF9B2, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -128,7 +128,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 applymovement 255, MauvilleCity_Movement_1DF6EE applymovement 7, MauvilleCity_Movement_1DF6F3 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6CC applymovement 7, MauvilleCity_Movement_1DF6FA @@ -147,7 +147,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D delay 30 applymovement 7, MauvilleCity_Movement_1DF6F7 waitmovement 0 - msgbox MauvilleCity_Text_1DFD34, 4 + msgbox MauvilleCity_Text_1DFD34, MSGBOX_DEFAULT closemessage applymovement 255, MauvilleCity_Movement_1DF6D0 applymovement 7, MauvilleCity_Movement_1DF703 @@ -170,7 +170,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 call_if 1, MauvilleCity_EventScript_1DF601 applymovement 255, MauvilleCity_Movement_2725AA waitmovement 0 - msgbox MauvilleCity_Text_1DFED5, 4 + msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT closemessage addvar VAR_0x40D1, 1 compare VAR_FACING, 2 @@ -207,29 +207,29 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628 return MauvilleCity_EventScript_1DF63A:: @ 81DF63A - msgbox MauvilleCity_Text_1DFB6D, 4 - trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_1DFB96 + msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFBC3, 4 + msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFBED, 4 + msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 - msgbox MauvilleCity_Text_1DFC8A, 4 + msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT return MauvilleCity_EventScript_1DF683:: @ 81DF683 setflag FLAG_0x11C - msgbox MauvilleCity_Text_1DFA4A, 4 + msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF690:: @ 81DF690 applymovement 6, MauvilleCity_Movement_27259E waitmovement 0 - msgbox MauvilleCity_Text_1DFB42, 5 + msgbox MauvilleCity_Text_1DFB42, MSGBOX_YESNO goto MauvilleCity_EventScript_1DF4AD end @@ -430,30 +430,30 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A goto_eq MauvilleCity_EventScript_1DF784 checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON goto_eq MauvilleCity_EventScript_1DF77A - msgbox MauvilleCity_Text_1DFFE4, 4 + msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT giveitem_std ITEM_BASEMENT_KEY setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF77A:: @ 81DF77A - msgbox MauvilleCity_Text_1E0154, 4 + msgbox MauvilleCity_Text_1E0154, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF784:: @ 81DF784 - msgbox MauvilleCity_Text_1E020E, 4 + msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT giveitem_std ITEM_TM24 compare VAR_RESULT, 0 goto_eq MauvilleCity_EventScript_272054 setflag FLAG_GOT_TM24_FROM_WATTSON - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end MauvilleCity_EventScript_1DF7B0:: @ 81DF7B0 - msgbox MauvilleCity_Text_1E02AA, 4 + msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT release end @@ -463,7 +463,7 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Text_1DFEB4, 4 + msgbox MauvilleCity_Text_1DFEB4, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -473,31 +473,31 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA end MauvilleCity_Text_1DF7DC: @ 81DF7DC - .string "UNCLE: It’s because of POKéMON that\n" - .string "this boy’s got more pep, I suppose…\l" - .string "But he’s become a bit too peppy…$" + .string "UNCLE: It's because of POKéMON that\n" + .string "this boy's got more pep, I suppose…\l" + .string "But he's become a bit too peppy…$" MauvilleCity_Text_1DF845: @ 81DF845 .string "WALLY: Aww, UNCLE, please?\p" .string "I want to challenge this GYM and see\n" - .string "how much better I’ve become.\p" + .string "how much better I've become.\p" .string "Please? May I, please?$" MauvilleCity_Text_1DF8B9: @ 81DF8B9 .string "UNCLE: Now hold on, WALLY.\p" .string "Since you started living with POKéMON,\n" .string "you have grown quite a lot stronger.\p" - .string "But don’t you think you’re pushing it\n" + .string "But don't you think you're pushing it\n" .string "to suddenly challenge a GYM?$" MauvilleCity_Text_1DF963: @ 81DF963 - .string "WALLY: I’m not pushing it.\p" + .string "WALLY: I'm not pushing it.\p" .string "If I combine forces with RALTS,\n" .string "we can beat anyone!$" MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "WALLY: Oh! Hi, {PLAYER}!\p" - .string "I’ve gotten a lot stronger since\n" + .string "I've gotten a lot stronger since\n" .string "we met.\p" .string "{PLAYER}, I want you and my UNCLE to\n" .string "understand that.\p" @@ -505,15 +505,15 @@ MauvilleCity_Text_1DF9B2: @ 81DF9B2 .string "a battle with me?$" MauvilleCity_Text_1DFA4A: @ 81DFA4A - .string "WALLY: Oh… If you won’t battle me,\n" - .string "{PLAYER}, my UNCLE won’t know that I’ve\l" + .string "WALLY: Oh… If you won't battle me,\n" + .string "{PLAYER}, my UNCLE won't know that I've\l" .string "become really strong.$" MauvilleCity_Text_1DFAA5: @ 81DFAA5 .string "UNCLE: {PLAYER}{KUN}, was it?\n" - .string "On WALLY’s behalf, can I ask you to\l" + .string "On WALLY's behalf, can I ask you to\l" .string "battle with him just this once?\p" - .string "I don’t think he’s going to listen to\n" + .string "I don't think he's going to listen to\n" .string "any reason the way he is now.$" MauvilleCity_Text_1DFB42: @ 81DFB42 @@ -531,31 +531,31 @@ MauvilleCity_Text_1DFB96: @ 81DFB96 MauvilleCity_Text_1DFBC3: @ 81DFBC3 .string "WALLY: UNCLE…\n" - .string "I’ll go back to VERDANTURF…$" + .string "I'll go back to VERDANTURF…$" MauvilleCity_Text_1DFBED: @ 81DFBED .string "{PLAYER}, thank you.\n" - .string "Being a TRAINER is tough, isn’t it?\p" - .string "It’s not enough just to have POKéMON\n" - .string "and make them battle. That isn’t what\l" + .string "Being a TRAINER is tough, isn't it?\p" + .string "It's not enough just to have POKéMON\n" + .string "and make them battle. That isn't what\l" .string "being a real TRAINER is about.$" MauvilleCity_Text_1DFC8A: @ 81DFC8A - .string "UNCLE: WALLY, there’s no need to be so\n" + .string "UNCLE: WALLY, there's no need to be so\n" .string "down on yourself.\p" - .string "Why, what’s keeping you from becoming\n" + .string "Why, what's keeping you from becoming\n" .string "stronger and stronger?\p" - .string "Come on, let’s go home.\n" - .string "Everyone’s waiting for you.$" + .string "Come on, let's go home.\n" + .string "Everyone's waiting for you.$" MauvilleCity_Text_1DFD34: @ 81DFD34 .string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n" .string "that you must be the TRAINER who kept\l" .string "an eye out for WALLY when he caught\l" .string "his POKéMON.\p" - .string "Why don’t you visit us in VERDANTURF\n" + .string "Why don't you visit us in VERDANTURF\n" .string "sometime?\l" - .string "I’m sure WALLY would enjoy it.$" + .string "I'm sure WALLY would enjoy it.$" MauvilleCity_Text_1DFDFB: @ 81DFDFB @@ -576,46 +576,46 @@ MauvilleCity_Text_1DFEB4: @ 81DFEB4 MauvilleCity_Text_1DFED5: @ 81DFED5 .string "SCOTT: Hehe…\n" .string "I was watching that match!\p" - .string "You’re friends with that boy WALLY,\n" - .string "aren’t you?\p" - .string "But you didn’t hold anything back\n" + .string "You're friends with that boy WALLY,\n" + .string "aren't you?\p" + .string "But you didn't hold anything back\n" .string "and beat him impressively.\p" - .string "Yeah! That’s what a real POKéMON\n" + .string "Yeah! That's what a real POKéMON\n" .string "battle is all about!\p" .string "I idolize TRAINERS like that!\p" .string "… … … … … …\n" - .string "I’ll be cheering for you!$" + .string "I'll be cheering for you!$" MauvilleCity_Text_1DFFE4: @ 81DFFE4 .string "WATTSON: Oh, {PLAYER}{KUN}!\n" .string "You look like you have a lot of zip!\l" - .string "That’s a good thing, wahahahaha!\p" - .string "Fine! I’ve decided!\n" + .string "That's a good thing, wahahahaha!\p" + .string "Fine! I've decided!\n" .string "I need a favor, {PLAYER}{KUN}!\p" .string "MAUVILLE CITY has an underground\n" .string "sector called NEW MAUVILLE.\p" - .string "{PLAYER}{KUN}, I’d like you to go there and\n" + .string "{PLAYER}{KUN}, I'd like you to go there and\n" .string "switch off the GENERATOR.\p" .string "The GENERATOR has been running a bit\n" - .string "haywire. It’s getting unsafe.\p" + .string "haywire. It's getting unsafe.\p" .string "Here, this is the KEY to get into\n" .string "NEW MAUVILLE.$" MauvilleCity_Text_1E0154: @ 81E0154 - .string "WATTSON: Don’t you worry about it.\n" - .string "It won’t be a challenge to you.\p" + .string "WATTSON: Don't you worry about it.\n" + .string "It won't be a challenge to you.\p" .string "The entrance to NEW MAUVILLE is just\n" .string "a short SURF away from ROUTE 110.\p" - .string "That’s it, then, you have my trust!\n" + .string "That's it, then, you have my trust!\n" .string "Wahahahaha!$" MauvilleCity_Text_1E020E: @ 81E020E .string "WATTSON: Wahahahaha!\p" - .string "I knew it, {PLAYER}{KUN}! I knew I’d made\n" + .string "I knew it, {PLAYER}{KUN}! I knew I'd made\n" .string "the right choice asking you!\p" .string "This is my thanks--a TM containing\n" .string "THUNDERBOLT!\p" - .string "Go on, you’ve earned it!$" + .string "Go on, you've earned it!$" MauvilleCity_Text_1E02AA: @ 81E02AA .string "WATTSON: Wahahahaha!\p" @@ -623,7 +623,7 @@ MauvilleCity_Text_1E02AA: @ 81E02AA .string "the young step up and take charge!$" MauvilleCity_Text_1E0301: @ 81E0301 - .string "You know, it’s cool to have POKéMON\n" + .string "You know, it's cool to have POKéMON\n" .string "battles and stuff…\p" .string "But if your POKéMON gets hurt,\n" .string "you have to nurse it back to health.$" @@ -635,12 +635,12 @@ MauvilleCity_Text_1E037C: @ 81E037C .string "people coming through.$" MauvilleCity_Text_1E03FB: @ 81E03FB - .string "Have you been to RYDEL’S CYCLES yet?\p" + .string "Have you been to RYDEL'S CYCLES yet?\p" .string "RYDEL, the owner, is a very generous\n" .string "man.$" MauvilleCity_Text_1E044A: @ 81E044A - .string "Even if you’re riding a BIKE,\n" + .string "Even if you're riding a BIKE,\n" .string "wild POKéMON could jump you.$" MauvilleCity_Text_1E0485: @ 81E0485 @@ -655,7 +655,7 @@ MauvilleCity_Text_1E04B7: @ 81E04B7 MauvilleCity_Text_1E0504: @ 81E0504 .string "“Ride in gravel and shake up your\n" .string "soul!”\l" - .string "RYDEL’S CYCLES$" + .string "RYDEL'S CYCLES$" MauvilleCity_Text_1E053C: @ 81E053C .string "“The play spot for all!”\n" @@ -663,14 +663,14 @@ MauvilleCity_Text_1E053C: @ 81E053C MauvilleCity_Text_1E056A: @ 81E056A .string "Hi, do you check out TV at all?\p" - .string "They’ve added a bunch of cool new\n" + .string "They've added a bunch of cool new\n" .string "shows recently.\p" - .string "TV is so cool. I’ve seen my friends on\n" + .string "TV is so cool. I've seen my friends on\n" .string "TV just out of the blue.\p" .string "And, sometimes, they even put you on TV\n" .string "without telling you.\p" .string "I wish I would be on TV sometime.\p" - .string "That’s why I think you should check\n" + .string "That's why I think you should check\n" .string "out TVs whenever you can.$" MauvilleCity_Text_1E0699: @ 81E0699 diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 0231e5bde..1634ee33c 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -8,8 +8,8 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC goto_eq MauvilleCity_BikeShop_EventScript_20EC94 checkflag FLAG_0x059 goto_eq MauvilleCity_BikeShop_EventScript_20EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE22, 4 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -17,7 +17,7 @@ MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC end MauvilleCity_BikeShop_EventScript_20EBF7:: @ 820EBF7 - msgbox MauvilleCity_BikeShop_Text_20EE99, 5 + msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20EC4A compare VAR_RESULT, 0 @@ -35,7 +35,7 @@ MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D setflag FLAG_0x059 - msgbox MauvilleCity_BikeShop_Text_20EEE8, 4 + msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT release end @@ -45,25 +45,25 @@ MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A end MauvilleCity_BikeShop_EventScript_20EC53:: @ 820EC53 - msgbox MauvilleCity_BikeShop_Text_20F18D, 4 + msgbox MauvilleCity_BikeShop_Text_20F18D, MSGBOX_DEFAULT giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D - msgbox MauvilleCity_BikeShop_Text_20F1A5, 4 + msgbox MauvilleCity_BikeShop_Text_20F1A5, MSGBOX_DEFAULT giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87 - msgbox MauvilleCity_BikeShop_Text_20F1BD, 4 + msgbox MauvilleCity_BikeShop_Text_20F1BD, MSGBOX_DEFAULT special SwapRegisteredBike release end MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 - msgbox MauvilleCity_BikeShop_Text_20F1FB, 5 + msgbox MauvilleCity_BikeShop_Text_20F1FB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECB3 compare VAR_RESULT, 0 @@ -71,25 +71,25 @@ MauvilleCity_BikeShop_EventScript_20EC94:: @ 820EC94 end MauvilleCity_BikeShop_EventScript_20ECB3:: @ 820ECB3 - msgbox MauvilleCity_BikeShop_Text_20F22F, 4 + msgbox MauvilleCity_BikeShop_Text_20F22F, MSGBOX_DEFAULT checkitem ITEM_ACRO_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ECEF checkitem ITEM_MACH_BIKE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_BikeShop_EventScript_20ED10 - msgbox MauvilleCity_BikeShop_Text_20F2F3, 4 + msgbox MauvilleCity_BikeShop_Text_20F2F3, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECE5:: @ 820ECE5 - msgbox MauvilleCity_BikeShop_Text_20F2C4, 4 + msgbox MauvilleCity_BikeShop_Text_20F2C4, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F294, 4 + msgbox MauvilleCity_BikeShop_Text_20F294, MSGBOX_DEFAULT takeitem ITEM_ACRO_BIKE, 1 giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 @@ -97,14 +97,14 @@ MauvilleCity_BikeShop_EventScript_20ECEF:: @ 820ECEF MauvilleCity_BikeShop_EventScript_20ED10:: @ 820ED10 incrementgamestat 4 - msgbox MauvilleCity_BikeShop_Text_20F263, 4 + msgbox MauvilleCity_BikeShop_Text_20F263, MSGBOX_DEFAULT takeitem ITEM_MACH_BIKE, 1 giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_20EC87 end MauvilleCity_BikeShop_EventScript_20ED31:: @ 820ED31 - msgbox MauvilleCity_BikeShop_Text_20F3C3, 2 + msgbox MauvilleCity_BikeShop_Text_20F3C3, MSGBOX_NPC end MauvilleCity_BikeShop_EventScript_20ED3A:: @ 820ED3A @@ -187,11 +187,11 @@ MauvilleCity_BikeShop_Text_20EE22: @ 820EE22 .string "Well, well, what have we here?\n" .string "A most energetic customer!\p" .string "Me? You may call me RYDEL.\n" - .string "I’m the owner of this cycle shop.$" + .string "I'm the owner of this cycle shop.$" MauvilleCity_BikeShop_Text_20EE99: @ 820EE99 .string "RYDEL: Your RUNNING SHOES…\n" - .string "They’re awfully filthy.\p" + .string "They're awfully filthy.\p" .string "Did you come from far away?$" MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 @@ -201,15 +201,15 @@ MauvilleCity_BikeShop_Text_20EEE8: @ 820EEE8 MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 .string "RYDEL: Hm, hm… … … … …\p" - .string "You’re saying that you came all this\n" + .string "You're saying that you came all this\n" .string "way from LITTLEROOT?\p" .string "My goodness!\n" - .string "That’s ridiculously far!\p" + .string "That's ridiculously far!\p" .string "If you had one of my BIKES, you could\n" .string "go anywhere easily while feeling the\l" .string "gentle caress of the wind!\p" - .string "I’ll tell you what!\n" - .string "I’ll give you a BIKE!\p" + .string "I'll tell you what!\n" + .string "I'll give you a BIKE!\p" .string "Oh, wait a second!\p" .string "I forgot to tell you that there are\n" .string "two kinds of BIKES!\p" @@ -219,7 +219,7 @@ MauvilleCity_BikeShop_Text_20EF32: @ 820EF32 .string "to feel the wind with their bodies!\p" .string "And an ACRO BIKE is for those who\n" .string "prefer technical rides!\p" - .string "I’m a real sweetheart, so you can\n" + .string "I'm a real sweetheart, so you can\n" .string "have whichever one you like!\p" .string "Which one will you choose?$" @@ -239,7 +239,7 @@ MauvilleCity_BikeShop_Text_20F1FB: @ 820F1FB MauvilleCity_BikeShop_Text_20F22F: @ 820F22F .string "RYDEL: Okay, no problem!\n" - .string "I’ll switch BIKES for you!$" + .string "I'll switch BIKES for you!$" MauvilleCity_BikeShop_Text_20F263: @ 820F263 .string "{PLAYER} got the MACH BIKE exchanged\n" @@ -251,26 +251,26 @@ MauvilleCity_BikeShop_Text_20F294: @ 820F294 MauvilleCity_BikeShop_Text_20F2C4: @ 820F2C4 .string "RYDEL: Good, good!\n" - .string "I’m happy that you like it!$" + .string "I'm happy that you like it!$" MauvilleCity_BikeShop_Text_20F2F3: @ 820F2F3 .string "Oh? What happened to that BIKE\n" .string "I gave you?\p" .string "Oh, I get it, you stored it using your PC.\p" .string "Well, take it out of PC storage,\n" - .string "and I’ll be happy to exchange it!\p" + .string "and I'll be happy to exchange it!\p" .string "May the wind always be at your back\n" .string "on your adventure!$" MauvilleCity_BikeShop_Text_20F3C3: @ 820F3C3 - .string "I’m learning about BIKES while\n" + .string "I'm learning about BIKES while\n" .string "I work here.\p" .string "If you need advice on how to ride your\n" - .string "BIKE, there’re a couple handbooks in\l" + .string "BIKE, there're a couple handbooks in\l" .string "the back.$" MauvilleCity_BikeShop_Text_20F445: @ 820F445 - .string "It’s a handbook on the MACH BIKE.\p" + .string "It's a handbook on the MACH BIKE.\p" .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_20F487: @ 820F487 @@ -282,7 +282,7 @@ MauvilleCity_BikeShop_Text_20F487: @ 820F487 .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_20F550: @ 820F550 - .string "A MACH BIKE is speedy, but it can’t\n" + .string "A MACH BIKE is speedy, but it can't\n" .string "stop very quickly.\p" .string "It gets a little tricky to get around\n" .string "a corner.\p" @@ -300,7 +300,7 @@ MauvilleCity_BikeShop_Text_20F61A: @ 820F61A .string "Want to read a different page?$" MauvilleCity_BikeShop_Text_20F6ED: @ 820F6ED - .string "It’s a handbook on the ACRO BIKE.\p" + .string "It's a handbook on the ACRO BIKE.\p" .string "Which page do you want to read?$" MauvilleCity_BikeShop_Text_20F72F: @ 820F72F diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 733581b74..135f48f23 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8 MauvilleCity_GameCorner_EventScript_20FBB9:: @ 820FBB9 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210460, 4 + msgbox MauvilleCity_GameCorner_Text_210460, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FCB7 @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -64,7 +64,7 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 nop updatecoinsbox 1, 6 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210529, 4 + msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT hidemoneybox nop nop @@ -73,12 +73,12 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75 end MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7 - msgbox MauvilleCity_GameCorner_Text_21047E, 4 + msgbox MauvilleCity_GameCorner_Text_21047E, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 - msgbox MauvilleCity_GameCorner_Text_210553, 4 + msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT hidemoneybox nop nop @@ -87,7 +87,7 @@ MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1 end MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 - msgbox MauvilleCity_GameCorner_Text_21059A, 4 + msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT hidemoneybox nop nop @@ -96,7 +96,7 @@ MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1 end MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 - msgbox MauvilleCity_GameCorner_Text_21057E, 4 + msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -107,7 +107,7 @@ MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1 MauvilleCity_GameCorner_EventScript_20FCF1:: @ 820FCF1 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FD0D @@ -152,7 +152,7 @@ MauvilleCity_GameCorner_EventScript_20FD83:: @ 820FD83 goto MauvilleCity_GameCorner_EventScript_20FD91 MauvilleCity_GameCorner_EventScript_20FD91:: @ 820FD91 - msgbox MauvilleCity_GameCorner_Text_210705, 5 + msgbox MauvilleCity_GameCorner_Text_210705, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_20FE92 switch VAR_TEMP_1 @@ -173,7 +173,7 @@ MauvilleCity_GameCorner_EventScript_20FDCB:: @ 820FDCB givedecoration 88 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -189,7 +189,7 @@ MauvilleCity_GameCorner_EventScript_20FE05:: @ 820FE05 givedecoration 89 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -205,12 +205,12 @@ MauvilleCity_GameCorner_EventScript_20FE3F:: @ 820FE3F givedecoration 90 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_210646, 4 + msgbox MauvilleCity_GameCorner_Text_210646, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end MauvilleCity_GameCorner_EventScript_20FE79:: @ 820FE79 - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FD20 end @@ -220,7 +220,7 @@ MauvilleCity_GameCorner_EventScript_20FE87:: @ 820FE87 end MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end @@ -228,7 +228,7 @@ MauvilleCity_GameCorner_EventScript_20FE92:: @ 820FE92 MauvilleCity_GameCorner_EventScript_20FE9F:: @ 820FE9F lock faceplayer - msgbox MauvilleCity_GameCorner_Text_2105D7, 4 + msgbox MauvilleCity_GameCorner_Text_2105D7, MSGBOX_DEFAULT checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_20FEBB @@ -291,7 +291,7 @@ MauvilleCity_GameCorner_EventScript_20FF77:: @ 820FF77 MauvilleCity_GameCorner_EventScript_20FF8A:: @ 820FF8A special sub_81398C0 - msgbox MauvilleCity_GameCorner_Text_210629, 5 + msgbox MauvilleCity_GameCorner_Text_210629, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210118 switch VAR_TEMP_1 @@ -313,7 +313,7 @@ MauvilleCity_GameCorner_EventScript_20FFDD:: @ 820FFDD giveitem ITEM_TM32, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -328,7 +328,7 @@ MauvilleCity_GameCorner_EventScript_210017:: @ 8210017 giveitem ITEM_TM29, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -343,7 +343,7 @@ MauvilleCity_GameCorner_EventScript_210051:: @ 8210051 giveitem ITEM_TM35, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -358,7 +358,7 @@ MauvilleCity_GameCorner_EventScript_21008B:: @ 821008B giveitem ITEM_TM24, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -373,12 +373,12 @@ MauvilleCity_GameCorner_EventScript_2100C5:: @ 82100C5 giveitem ITEM_TM13, 1 updatecoinsbox 1, 1 playse SE_REGI - msgbox MauvilleCity_GameCorner_Text_21071B, 4 + msgbox MauvilleCity_GameCorner_Text_21071B, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end MauvilleCity_GameCorner_EventScript_2100FF:: @ 82100FF - msgbox MauvilleCity_GameCorner_Text_210673, 4 + msgbox MauvilleCity_GameCorner_Text_210673, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_20FECE end @@ -388,17 +388,17 @@ MauvilleCity_GameCorner_EventScript_21010D:: @ 821010D end MauvilleCity_GameCorner_EventScript_210118:: @ 8210118 - msgbox MauvilleCity_GameCorner_Text_2106BF, 4 + msgbox MauvilleCity_GameCorner_Text_2106BF, MSGBOX_DEFAULT hidecoinsbox 0, 0 release end MauvilleCity_GameCorner_EventScript_210125:: @ 8210125 - msgbox MauvilleCity_GameCorner_Text_2109D3, 2 + msgbox MauvilleCity_GameCorner_Text_2109D3, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E - msgbox MauvilleCity_GameCorner_Text_210A05, 2 + msgbox MauvilleCity_GameCorner_Text_210A05, MSGBOX_NPC end MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 @@ -406,7 +406,7 @@ MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 faceplayer checkflag FLAG_0x0E2 goto_eq MauvilleCity_GameCorner_EventScript_210213 - msgbox MauvilleCity_GameCorner_Text_210750, 5 + msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_210209 switch VAR_STARTER_MON @@ -420,7 +420,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C checkdecorspace 88 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -431,7 +431,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 checkdecorspace 89 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -442,7 +442,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 checkdecorspace 90 compare VAR_RESULT, 0 goto_eq MauvilleCity_GameCorner_EventScript_2101FA - msgbox MauvilleCity_GameCorner_Text_21079C, 4 + msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 setflag FLAG_0x0E2 goto MauvilleCity_GameCorner_EventScript_210213 @@ -450,17 +450,17 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 MauvilleCity_GameCorner_EventScript_2101FA:: @ 82101FA call MauvilleCity_GameCorner_EventScript_272071 - msgbox MauvilleCity_GameCorner_Text_2107A9, 4 + msgbox MauvilleCity_GameCorner_Text_2107A9, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210209:: @ 8210209 - msgbox MauvilleCity_GameCorner_Text_2107CE, 4 + msgbox MauvilleCity_GameCorner_Text_2107CE, MSGBOX_DEFAULT release end MauvilleCity_GameCorner_EventScript_210213:: @ 8210213 - msgbox MauvilleCity_GameCorner_Text_2107FB, 4 + msgbox MauvilleCity_GameCorner_Text_2107FB, MSGBOX_DEFAULT release end @@ -470,7 +470,7 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_GameCorner_EventScript_21023D - msgbox MauvilleCity_GameCorner_Text_210830, 4 + msgbox MauvilleCity_GameCorner_Text_210830, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -482,34 +482,34 @@ MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D goto_if 4, MauvilleCity_GameCorner_EventScript_21026B setflag FLAG_0x0E1 givecoins 20 - msgbox MauvilleCity_GameCorner_Text_2108A0, 4 + msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT playse SE_REGI goto MauvilleCity_GameCorner_EventScript_21026B end MauvilleCity_GameCorner_EventScript_21026B:: @ 821026B - msgbox MauvilleCity_GameCorner_Text_2108EF, 4 + msgbox MauvilleCity_GameCorner_Text_2108EF, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210279:: @ 8210279 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210932, 4 + msgbox MauvilleCity_GameCorner_Text_210932, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210289:: @ 8210289 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_21098E, 4 + msgbox MauvilleCity_GameCorner_Text_21098E, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_210299:: @ 8210299 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A51, 4 + msgbox MauvilleCity_GameCorner_Text_210A51, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -523,14 +523,14 @@ MauvilleCity_GameCorner_EventScript_2102A9:: @ 82102A9 MauvilleCity_GameCorner_EventScript_2102B6:: @ 82102B6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210A82, 4 + msgbox MauvilleCity_GameCorner_Text_210A82, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end MauvilleCity_GameCorner_EventScript_2102C6:: @ 82102C6 lock faceplayer - msgbox MauvilleCity_GameCorner_Text_210B04, 4 + msgbox MauvilleCity_GameCorner_Text_210B04, MSGBOX_DEFAULT goto MauvilleCity_GameCorner_EventScript_2102A9 end @@ -667,7 +667,7 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 end MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, 4 + msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT releaseall end @@ -677,12 +677,12 @@ MauvilleCity_GameCorner_Text_210460: @ 8210460 MauvilleCity_GameCorner_Text_21047E: @ 821047E .string "Okay, you wanted some COINS for\n" .string "the games?\p" - .string "But you don’t have a COIN CASE for\n" + .string "But you don't have a COIN CASE for\n" .string "stowing the COINS.$" MauvilleCity_GameCorner_Text_2104DF: @ 82104DF .string "Were you looking for COINS?\p" - .string "It’s ¥1000 for 50 COINS.\n" + .string "It's ¥1000 for 50 COINS.\n" .string "Would you like some?$" MauvilleCity_GameCorner_Text_210529: @ 8210529 @@ -690,7 +690,7 @@ MauvilleCity_GameCorner_Text_210529: @ 8210529 .string "Here are your COINS!$" MauvilleCity_GameCorner_Text_210553: @ 8210553 - .string "Um… You don’t appear to have\n" + .string "Um… You don't appear to have\n" .string "enough money…$" MauvilleCity_GameCorner_Text_21057E: @ 821057E @@ -698,7 +698,7 @@ MauvilleCity_GameCorner_Text_21057E: @ 821057E .string "Your COIN CASE is full.$" MauvilleCity_GameCorner_Text_21059A: @ 821059A - .string "Oh… You don’t need COINS, then?\n" + .string "Oh… You don't need COINS, then?\n" .string "Good luck on your adventure!$" MauvilleCity_GameCorner_Text_2105D7: @ 82105D7 @@ -715,13 +715,13 @@ MauvilleCity_GameCorner_Text_210629: @ 8210629 MauvilleCity_GameCorner_Text_210646: @ 8210646 .string "Thank you!\n" - .string "We’ll send it to your PC at home.$" + .string "We'll send it to your PC at home.$" MauvilleCity_GameCorner_Text_210673: @ 8210673 - .string "You don’t have enough COINS.$" + .string "You don't have enough COINS.$" MauvilleCity_GameCorner_Text_210690: @ 8210690 - .string "There isn’t any room available for\n" + .string "There isn't any room available for\n" .string "placing {STR_VAR_1}.$" MauvilleCity_GameCorner_Text_2106BF: @ 82106BF @@ -736,7 +736,7 @@ MauvilleCity_GameCorner_Text_21071B: @ 821071B .string "Here you go!$" MauvilleCity_GameCorner_Text_210728: @ 8210728 - .string "Oh, you can’t carry any more than that.$" + .string "Oh, you can't carry any more than that.$" MauvilleCity_GameCorner_Text_210750: @ 8210750 .string "I made a mistake and got two of\n" @@ -751,11 +751,11 @@ MauvilleCity_GameCorner_Text_2107A9: @ 82107A9 .string "You want it, but not right now?$" MauvilleCity_GameCorner_Text_2107CE: @ 82107CE - .string "Oh, don’t be so negative!\n" + .string "Oh, don't be so negative!\n" .string "You can have this!$" MauvilleCity_GameCorner_Text_2107FB: @ 82107FB - .string "There’s a prize I want, but I can’t win\n" + .string "There's a prize I want, but I can't win\n" .string "the jackpot.$" MauvilleCity_GameCorner_Text_210830: @ 8210830 @@ -772,16 +772,16 @@ MauvilleCity_GameCorner_Text_2108A0: @ 82108A0 MauvilleCity_GameCorner_Text_2108EF: @ 82108EF .string "MAUVILLE has something for\n" .string "everyone.\p" - .string "For me, it’s the GAME CORNER.$" + .string "For me, it's the GAME CORNER.$" MauvilleCity_GameCorner_Text_210932: @ 8210932 .string "The ROULETTE tables have different\n" .string "rates.\p" - .string "Check your COINS if you’re going to\n" + .string "Check your COINS if you're going to\n" .string "pick a table.$" MauvilleCity_GameCorner_Text_21098E: @ 821098E - .string "It’s easy to lose track of time in here. \n" + .string "It's easy to lose track of time in here. \n" .string "I should get back to work.$" MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 @@ -790,21 +790,21 @@ MauvilleCity_GameCorner_Text_2109D3: @ 82109D3 MauvilleCity_GameCorner_Text_210A05: @ 8210A05 .string "This ROULETTE thing…\n" - .string "It’s rather demanding.\p" - .string "Win or lose, it’s only by luck.$" + .string "It's rather demanding.\p" + .string "Win or lose, it's only by luck.$" MauvilleCity_GameCorner_Text_210A51: @ 8210A51 .string "Up to three COINS can be used to play\n" .string "the SLOTS.$" MauvilleCity_GameCorner_Text_210A82: @ 8210A82 - .string "It’s very difficult to make it stop\n" + .string "It's very difficult to make it stop\n" .string "right on “7.”\p" .string "If it stops on “7” during the REEL TIME\n" - .string "bonus game, you’ll receive extra COINS.$" + .string "bonus game, you'll receive extra COINS.$" MauvilleCity_GameCorner_Text_210B04: @ 8210B04 - .string "Here’s some information for you\n" + .string "Here's some information for you\n" .string "about the SLOTS.\p" .string "The more lightning bolts you stock,\n" .string "the more REEL TIME chances you get.\p" @@ -812,10 +812,10 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04 .string "REEL TIME chances…\p" .string "It is possible to receive four regular\n" .string "bonuses, then a big bonus.\p" - .string "That would total 660 COINS, but it’s\n" + .string "That would total 660 COINS, but it's\n" .string "very difficult to get.$" MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E - .string "You can’t play if you don’t have\n" + .string "You can't play if you don't have\n" .string "a COIN CASE.$" diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index a284d1dd7..fbc1d8b0b 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -76,7 +76,7 @@ MauvilleCity_Gym_EventScript_20DEE7:: @ 820DEE7 end MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB - trainerbattle 1, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B + trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E602, MauvilleCity_Gym_Text_20E734, MauvilleCity_Gym_EventScript_20DF2B, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MauvilleCity_Gym_EventScript_20DFDE @@ -84,7 +84,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB goto_if 0, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 goto_eq MauvilleCity_Gym_EventScript_20DFD4 - msgbox MauvilleCity_Gym_Text_20E8E3, 4 + msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT release end @@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B message MauvilleCity_Gym_Text_20E77F waitmessage call MauvilleCity_Gym_EventScript_27207E - msgbox MauvilleCity_Gym_Text_20E7AA, 4 + msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT setflag FLAG_0x4F2 @@ -109,7 +109,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MauvilleCity_Gym_Text_20E8B5, 4 + msgbox MauvilleCity_Gym_Text_20E8B5, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -121,7 +121,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_272054 - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 release end @@ -130,18 +130,18 @@ MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 giveitem_std ITEM_TM34 compare VAR_RESULT, 0 goto_eq MauvilleCity_Gym_EventScript_27205E - msgbox MauvilleCity_Gym_Text_20E844, 4 + msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT setflag FLAG_0x0A7 return MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 - msgbox MauvilleCity_Gym_Text_20E925, 4 + msgbox MauvilleCity_Gym_Text_20E925, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE - trainerbattle 7, TRAINER_WATTSON_1, 0, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD - msgbox MauvilleCity_Gym_Text_20EA5E, 6 + trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_20E9A7, MauvilleCity_Gym_Text_20EA42, MauvilleCity_Gym_Text_20EAFD + msgbox MauvilleCity_Gym_Text_20EA5E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 @@ -215,28 +215,28 @@ MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 end MauvilleCity_Gym_EventScript_20E0B9:: @ 820E0B9 - trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC - msgbox MauvilleCity_Gym_Text_20E336, 6 + trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_20E2BC, MauvilleCity_Gym_Text_20E2FC + msgbox MauvilleCity_Gym_Text_20E336, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0D0:: @ 820E0D0 - trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 - msgbox MauvilleCity_Gym_Text_20E3C1, 6 + trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_20E369, MauvilleCity_Gym_Text_20E3A7 + msgbox MauvilleCity_Gym_Text_20E3C1, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0E7:: @ 820E0E7 - trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 - msgbox MauvilleCity_Gym_Text_20E47E, 6 + trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_20E443, MauvilleCity_Gym_Text_20E469 + msgbox MauvilleCity_Gym_Text_20E47E, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E0FE:: @ 820E0FE - trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 - msgbox MauvilleCity_Gym_Text_20E50F, 6 + trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_20E4BB, MauvilleCity_Gym_Text_20E4F4 + msgbox MauvilleCity_Gym_Text_20E50F, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E115:: @ 820E115 - trainerbattle 0, TRAINER_ANGELO, 0, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 - msgbox MauvilleCity_Gym_Text_20E5C2, 6 + trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_20E593, MauvilleCity_Gym_Text_20E5A8 + msgbox MauvilleCity_Gym_Text_20E5C2, MSGBOX_AUTOCLOSE end MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C @@ -244,12 +244,12 @@ MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C faceplayer checkflag FLAG_0x4F2 goto_eq MauvilleCity_Gym_EventScript_20E141 - msgbox MauvilleCity_Gym_Text_20E17F, 4 + msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end MauvilleCity_Gym_EventScript_20E141:: @ 820E141 - msgbox MauvilleCity_Gym_Text_20E283, 4 + msgbox MauvilleCity_Gym_Text_20E283, MSGBOX_DEFAULT release end @@ -268,32 +268,32 @@ MauvilleCity_Gym_EventScript_20E15B:: @ 820E15B end MauvilleCity_Gym_EventScript_20E16B:: @ 820E16B - msgbox MauvilleCity_Gym_Text_20E96C, 4 + msgbox MauvilleCity_Gym_Text_20E96C, MSGBOX_DEFAULT releaseall end MauvilleCity_Gym_EventScript_20E175:: @ 820E175 - msgbox MauvilleCity_Gym_Text_20E952, 4 + msgbox MauvilleCity_Gym_Text_20E952, MSGBOX_DEFAULT releaseall end MauvilleCity_Gym_Text_20E17F: @ 820E17F - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "WATTSON, the LEADER of MAUVILLE\n" .string "GYM, uses ELECTRIC-type POKéMON.\p" .string "If you challenge him with WATER-type\n" - .string "POKéMON, he’ll zap them! Bzzt!\p" - .string "And, he’s put in switch-controlled\n" + .string "POKéMON, he'll zap them! Bzzt!\p" + .string "And, he's put in switch-controlled\n" .string "doors all over his GYM! Eccentric!\p" .string "Hey, go for it!$" MauvilleCity_Gym_Text_20E283: @ 820E283 - .string "Whoa, you’re electrifying!\n" - .string "You’ve powered the door open!$" + .string "Whoa, you're electrifying!\n" + .string "You've powered the door open!$" MauvilleCity_Gym_Text_20E2BC: @ 820E2BC - .string "My electric soul, it’ll shatter your\n" + .string "My electric soul, it'll shatter your\n" .string "dreams whole, whoa-yeahah!$" MauvilleCity_Gym_Text_20E2FC: @ 820E2FC @@ -301,12 +301,12 @@ MauvilleCity_Gym_Text_20E2FC: @ 820E2FC .string "over-driven electric, man!$" MauvilleCity_Gym_Text_20E336: @ 820E336 - .string "POKéMON and rock, it’s all about heart,\n" + .string "POKéMON and rock, it's all about heart,\n" .string "whoa-yeah!$" MauvilleCity_Gym_Text_20E369: @ 820E369 .string "I trained under WATTSON!\n" - .string "There ain’t no way I’ll lose easily!$" + .string "There ain't no way I'll lose easily!$" MauvilleCity_Gym_Text_20E3A7: @ 820E3A7 .string "Unplugged and turned off…$" @@ -318,25 +318,25 @@ MauvilleCity_Gym_Text_20E3C1: @ 820E3C1 .string "daddy was born, that tough coot.$" MauvilleCity_Gym_Text_20E443: @ 820E443 - .string "This GYM’s got puzzles!\n" - .string "Isn’t it fun?$" + .string "This GYM's got puzzles!\n" + .string "Isn't it fun?$" MauvilleCity_Gym_Text_20E469: @ 820E469 - .string "It’s no fun to lose…$" + .string "It's no fun to lose…$" MauvilleCity_Gym_Text_20E47E: @ 820E47E .string "WATTSON says he likes setting up\n" .string "little traps with switches.$" MauvilleCity_Gym_Text_20E4BB: @ 820E4BB - .string "With my charm and my POKéMON’s moves,\n" - .string "you’ll be shocked!$" + .string "With my charm and my POKéMON's moves,\n" + .string "you'll be shocked!$" MauvilleCity_Gym_Text_20E4F4: @ 820E4F4 - .string "I’m shocked by your power!$" + .string "I'm shocked by your power!$" MauvilleCity_Gym_Text_20E50F: @ 820E50F - .string "I’ve heard that MAUVILLE was founded\n" + .string "I've heard that MAUVILLE was founded\n" .string "by WATTSON.\p" .string "He was a TRAINER long before we\n" .string "became TRAINERS.\l" @@ -350,16 +350,16 @@ MauvilleCity_Gym_Text_20E5A8: @ 820E5A8 .string "My eyes are frazzled…$" MauvilleCity_Gym_Text_20E5C2: @ 820E5C2 - .string "MAUVILLE GYM’s WATTSON has a shiny\n" + .string "MAUVILLE GYM's WATTSON has a shiny\n" .string "forehead. It makes me happy!$" MauvilleCity_Gym_Text_20E602: @ 820E602 - .string "I’ve given up on my plans to convert\n" + .string "I've given up on my plans to convert\n" .string "the city, I have.\p" .string "And so, I put my time into making\n" .string "door traps in my GYM.\p" .string "Oh? Now, what are you doing here?\p" - .string "What’s that? You say you’ve gotten\n" + .string "What's that? You say you've gotten\n" .string "past all my rigged doors?\p" .string "Wahahahah!\n" .string "Now, that is amusing!\p" @@ -386,7 +386,7 @@ MauvilleCity_Gym_Text_20E7AA: @ 820E7AA MauvilleCity_Gym_Text_20E844: @ 820E844 .string "That TM34 there contains SHOCK WAVE.\p" - .string "It’s a trustworthy move that never\n" + .string "It's a trustworthy move that never\n" .string "misses! You can count on it!\p" .string "… … … … … …$" @@ -407,7 +407,7 @@ MauvilleCity_Gym_Text_20E952: @ 820E952 MauvilleCity_Gym_Text_20E96C: @ 820E96C .string "MAUVILLE CITY POKéMON GYM\p" - .string "WATTSON’S CERTIFIED TRAINERS:\n" + .string "WATTSON'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 @@ -415,20 +415,20 @@ MauvilleCity_Gym_Text_20E9A7: @ 820E9A7 .string "I know what you want.\l" .string "You want to battle my POKéMON!\p" .string "Wahahahaha!\p" - .string "I’ll make sparks fly from you!\n" - .string "Don’t say I didn’t warn you!$" + .string "I'll make sparks fly from you!\n" + .string "Don't say I didn't warn you!$" MauvilleCity_Gym_Text_20EA42: @ 820EA42 .string "Oof…\n" .string "Our batteries ran dry…$" MauvilleCity_Gym_Text_20EA5E: @ 820EA5E - .string "WATTSON: We’ll have to recharge our\n" + .string "WATTSON: We'll have to recharge our\n" .string "batteries again.\p" - .string "When we’re fully charged up, we’ll\n" + .string "When we're fully charged up, we'll\n" .string "gladly accept your challenge.\p" .string "So, come back again sometime,\n" - .string "won’t you?$" + .string "won't you?$" MauvilleCity_Gym_Text_20EAFD: @ 820EAFD .string "WATTSON: Ah-ha! Here at last!\n" @@ -436,7 +436,7 @@ MauvilleCity_Gym_Text_20EAFD: @ 820EAFD .string "You want to battle my POKéMON!\p" .string "Wahahahaha!\p" .string "Oops! Wait!\n" - .string "You’ve only one POKéMON with you!\p" + .string "You've only one POKéMON with you!\p" .string "Come see me with two or more\n" .string "POKéMON, all right?$" diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index dd3e1665f..d5605e5d7 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -6,16 +6,16 @@ MauvilleCity_House1_EventScript_20F976:: @ 820F976 faceplayer checkflag FLAG_0x06B goto_eq MauvilleCity_House1_EventScript_20F9A5 - msgbox MauvilleCity_House1_Text_20F9AF, 4 + msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 setflag FLAG_0x06B setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - msgbox MauvilleCity_House1_Text_20FAA9, 4 + msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT release end MauvilleCity_House1_EventScript_20F9A5:: @ 820F9A5 - msgbox MauvilleCity_House1_Text_20FB67, 4 + msgbox MauvilleCity_House1_Text_20FB67, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 7a1a1cad1..2256fd1fe 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D faceplayer checkflag FLAG_0x102 goto_eq MauvilleCity_House2_EventScript_210CDA - msgbox MauvilleCity_House2_Text_210CEE, 4 + msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210C82 @@ -19,7 +19,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 waitmovement 0 applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_27259A waitmovement 0 - msgbox MauvilleCity_House2_Text_210D76, 5 + msgbox MauvilleCity_House2_Text_210D76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MauvilleCity_House2_EventScript_210CB8 compare VAR_RESULT, 0 @@ -27,7 +27,7 @@ MauvilleCity_House2_EventScript_210C82:: @ 8210C82 end MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 - msgbox MauvilleCity_House2_Text_210DB3, 4 + msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE setflag FLAG_0x102 @@ -35,19 +35,19 @@ MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 end MauvilleCity_House2_EventScript_210CDA:: @ 8210CDA - msgbox MauvilleCity_House2_Text_210DE7, 4 + msgbox MauvilleCity_House2_Text_210DE7, MSGBOX_DEFAULT release end MauvilleCity_House2_EventScript_210CE4:: @ 8210CE4 - msgbox MauvilleCity_House2_Text_210E16, 4 + msgbox MauvilleCity_House2_Text_210E16, MSGBOX_DEFAULT release end MauvilleCity_House2_Text_210CEE: @ 8210CEE - .string "If I had a BIKE, it’d be easy to cycle to\n" + .string "If I had a BIKE, it'd be easy to cycle to\n" .string "SLATEPORT for some shopping.\p" - .string "I’d be able to buy HARBOR MAIL at the\n" + .string "I'd be able to buy HARBOR MAIL at the\n" .string "POKéMON MART in SLATEPORT…$" MauvilleCity_House2_Text_210D76: @ 8210D76 @@ -55,15 +55,15 @@ MauvilleCity_House2_Text_210D76: @ 8210D76 .string "Will you trade it for a COIN CASE?$" MauvilleCity_House2_Text_210DB3: @ 8210DB3 - .string "Oh, I’m so happy!\n" - .string "Okay, I’ll trade you a COIN CASE!$" + .string "Oh, I'm so happy!\n" + .string "Okay, I'll trade you a COIN CASE!$" MauvilleCity_House2_Text_210DE7: @ 8210DE7 .string "That COIN CASE can be used\n" .string "at the GAME CORNER.$" MauvilleCity_House2_Text_210E16: @ 8210E16 - .string "Oh, that’s disappointing.\p" + .string "Oh, that's disappointing.\p" .string "A COIN CASE is needed for the\n" .string "GAME CORNER.$" diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index 56ee9497f..44e36489a 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_Mart_EventScript_2110E6:: @ 82110E6 message gUnknown_08272A21 waitmessage pokemart MauvilleCity_Mart_Pokemart_211100 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -30,11 +30,11 @@ MauvilleCity_Mart_Pokemart_211100: @ 8211100 end MauvilleCity_Mart_EventScript_21111C:: @ 821111C - msgbox MauvilleCity_Mart_Text_21112E, 2 + msgbox MauvilleCity_Mart_Text_21112E, MSGBOX_NPC end MauvilleCity_Mart_EventScript_211125:: @ 8211125 - msgbox MauvilleCity_Mart_Text_2111D8, 2 + msgbox MauvilleCity_Mart_Text_2111D8, MSGBOX_NPC end MauvilleCity_Mart_Text_21112E: @ 821112E @@ -48,6 +48,6 @@ MauvilleCity_Mart_Text_21112E: @ 821112E MauvilleCity_Mart_Text_2111D8: @ 82111D8 .string "Use a certain move, or use an item\n" .string "instead…\p" - .string "The TRAINER’s decisions determine how\n" + .string "The TRAINER's decisions determine how\n" .string "battles turn out, I think.$" diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index b2267122b..1eac0efc9 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -22,33 +22,33 @@ MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 end MauvilleCity_PokemonCenter_1F_EventScript_210E86:: @ 8210E86 - msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210EA1, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E8F:: @ 8210E8F - msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F06, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_EventScript_210E98:: @ 8210E98 - msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, 2 + msgbox MauvilleCity_PokemonCenter_1F_Text_210F8A, MSGBOX_NPC end MauvilleCity_PokemonCenter_1F_Text_210EA1: @ 8210EA1 .string "That man over there, he says weird\n" .string "things!\p" - .string "He’s funny in a weird way.\n" - .string "I doubt I’ll forget about him!$" + .string "He's funny in a weird way.\n" + .string "I doubt I'll forget about him!$" MauvilleCity_PokemonCenter_1F_Text_210F06: @ 8210F06 .string "When I accessed the RECORD CORNER,\n" - .string "the data for what’s hot in DEWFORD\l" + .string "the data for what's hot in DEWFORD\l" .string "got updated.\p" .string "Now that bit of data is the same\n" - .string "as my friend’s!$" + .string "as my friend's!$" MauvilleCity_PokemonCenter_1F_Text_210F8A: @ 8210F8A .string "A RECORD CORNER opened upstairs in\n" .string "the POKéMON CENTER.\p" - .string "I don’t know what it’s about, but it\n" - .string "sounds fun. I’ll go check it out!$" + .string "I don't know what it's about, but it\n" + .string "sounds fun. I'll go check it out!$" diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index c430b4440..196d49a26 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MauvilleCity_PokemonCenter_2F_EventScript_211029:: @ 8211029 end MauvilleCity_PokemonCenter_2F_EventScript_21102F:: @ 821102F - msgbox MauvilleCity_PokemonCenter_2F_Text_211038, 2 + msgbox MauvilleCity_PokemonCenter_2F_Text_211038, MSGBOX_NPC end MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 @@ -26,6 +26,6 @@ MauvilleCity_PokemonCenter_2F_Text_211038: @ 8211038 .string "at the COLOSSEUM here?\p" .string "They put up your record on the wall\n" .string "for everyone to see.\p" - .string "It’s embarrassing if you lose more\n" + .string "It's embarrassing if you lose more\n" .string "often than you win…$" diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index e8b81164f..23afa4845 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -22,7 +22,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F delay 30 applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF47, 4 + msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_2725A6 applymovement 6, MeteorFalls_1F_1R_Movement_2725A6 @@ -32,11 +32,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_27259A waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BF84, 4 + msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT closemessage applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22BFE4, 4 + msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_2725A4 applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 @@ -53,7 +53,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F applymovement 5, MeteorFalls_1F_1R_Movement_2725A4 applymovement 6, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C04E, 4 + msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT closemessage applymovement 255, MeteorFalls_1F_1R_Movement_22BF1D applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4 @@ -63,18 +63,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C11C, 4 + msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT closemessage applymovement 8, MeteorFalls_1F_1R_Movement_22BF08 applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C268, 4 + msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725AA waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C292, 4 + msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT applymovement 7, MeteorFalls_1F_1R_Movement_2725A4 waitmovement 0 - msgbox MeteorFalls_1F_1R_Text_22C2FC, 4 + msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT closemessage applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0 applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE @@ -224,12 +224,12 @@ MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 checkflag FLAG_0x0F4 goto_eq MeteorFalls_1F_1R_EventScript_22BF3D setflag FLAG_0x0F4 - msgbox MeteorFalls_1F_1R_Text_22C342, 4 + msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release end MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D - msgbox MeteorFalls_1F_1R_Text_22C47D, 4 + msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT release end @@ -240,34 +240,34 @@ MeteorFalls_1F_1R_Text_22BF47: @ 822BF47 MeteorFalls_1F_1R_Text_22BF84: @ 822BF84 .string "Heh?\p" - .string "I don’t know who you are, but if you get\n" - .string "in the way of TEAM MAGMA, don’t\l" + .string "I don't know who you are, but if you get\n" + .string "in the way of TEAM MAGMA, don't\l" .string "expect any mercy!$" MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4 .string "Hold it right there, TEAM MAGMA!\p" - .string "You’re badly mistaken if you think you\n" + .string "You're badly mistaken if you think you\n" .string "can have your way with the world!$" MeteorFalls_1F_1R_Text_22C04E: @ 822C04E .string "Hehehe!\n" .string "Even TEAM AQUA joins us!\p" - .string "But it’s too much trouble to deal with\n" + .string "But it's too much trouble to deal with\n" .string "you all…\p" - .string "Heh, it doesn’t matter!\p" - .string "We’ve got the METEORITE, so off to\n" + .string "Heh, it doesn't matter!\p" + .string "We've got the METEORITE, so off to\n" .string "MT. CHIMNEY we go!\p" .string "Hehehe! Be seeing you, you TEAM\n" .string "AQUA dingbats!$" MeteorFalls_1F_1R_Text_22C11C: @ 822C11C - .string "ARCHIE: Didn’t I see you before?\n" - .string "At SLATEPORT’s MUSEUM?\p" + .string "ARCHIE: Didn't I see you before?\n" + .string "At SLATEPORT's MUSEUM?\p" .string "Ah, so your name is {PLAYER}.\p" .string "At the time, I thought you were one\n" - .string "of TEAM MAGMA’s goons.\p" + .string "of TEAM MAGMA's goons.\p" .string "Humph…\n" - .string "You’re one odd kid.\p" + .string "You're one odd kid.\p" .string "TEAM MAGMA is a dangerous group of\n" .string "total fanatics.\p" .string "They engage in destruction, claiming\n" @@ -281,8 +281,8 @@ MeteorFalls_1F_1R_Text_22C268: @ 822C268 MeteorFalls_1F_1R_Text_22C292: @ 822C292 .string "ARCHIE: Yes, yes, we must!\n" - .string "We’ve got to hurry.\p" - .string "There’s no telling what TEAM MAGMA\n" + .string "We've got to hurry.\p" + .string "There's no telling what TEAM MAGMA\n" .string "will do at MT. CHIMNEY!$" MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC @@ -291,8 +291,8 @@ MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC .string "Farewell!$" MeteorFalls_1F_1R_Text_22C342: @ 822C342 - .string "I… I’m COZMO…\n" - .string "I’m a PROFESSOR…\p" + .string "I… I'm COZMO…\n" + .string "I'm a PROFESSOR…\p" .string "TEAM MAGMA asked me to guide them\n" .string "to METEOR FALLS…\p" .string "But they tricked me.\n" @@ -300,7 +300,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342 .string "And then another similar bunch,\n" .string "TEAM AQUA showed up.\p" .string "After that…\n" - .string "I don’t understand any of it.\p" + .string "I don't understand any of it.\p" .string "But that TEAM MAGMA…\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 4f4ab7c6b..c1427d1f2 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,74 +2,65 @@ MeteorFalls_1F_2R_MapScripts:: @ 822C4DD .byte 0 MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE - trainerbattle 2, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A + trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C529 - msgbox MeteorFalls_1F_2R_Text_22C6A3, 4 + msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A special sub_80B4808 waitmovement 0 - msgbox MeteorFalls_1F_2R_Text_22C6F6, 4 - setvar VAR_0x8004, 392 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 392 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT + register_matchcall TRAINER_NICOLAS_1 release end MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529 - trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD - msgbox MeteorFalls_1F_2R_Text_22C7D8, 6 + trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD + msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C589 - msgbox MeteorFalls_1F_2R_Text_22C8C1, 4 + msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589 - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 - msgbox MeteorFalls_1F_2R_Text_22CBC5, 6 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27 + msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4 - trainerbattle 6, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 + trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MeteorFalls_1F_2R_EventScript_22C5ED - msgbox MeteorFalls_1F_2R_Text_22CA70, 4 + msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT release end MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4 - msgbox MeteorFalls_1F_2R_Text_22C99C, 4 - setvar VAR_0x8004, 681 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 681 - callstd 8 + msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT + register_matchcall TRAINER_JOHN_AND_JAY_1 release end MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED - trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB - msgbox MeteorFalls_1F_2R_Text_22CD34, 6 + trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB + msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE end MeteorFalls_1F_2R_Text_22C608: @ 822C608 @@ -80,7 +71,7 @@ MeteorFalls_1F_2R_Text_22C608: @ 822C608 MeteorFalls_1F_2R_Text_22C678: @ 822C678 .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "I didn't expect you to be so strong!$" MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3 .string "The road ahead remains long and harsh.\p" @@ -94,37 +85,37 @@ MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6 MeteorFalls_1F_2R_Text_22C73F: @ 822C73F .string "Since we met, we have trained hard\n" .string "with our sights on number one.\p" - .string "Help us see how much stronger we’ve\n" + .string "Help us see how much stronger we've\n" .string "become!$" MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD .string "Urgh!\n" - .string "I didn’t expect you to be so strong!$" + .string "I didn't expect you to be so strong!$" MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8 - .string "You’ve obviously kept up your\n" + .string "You've obviously kept up your\n" .string "POKéMON training.\p" .string "So long as you remain strong, I, too,\n" .string "can become stronger!$" MeteorFalls_1F_2R_Text_22C843: @ 822C843 - .string "JOHN: We’ve always battled POKéMON\n" + .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "We've confidence in ourselves.$" MeteorFalls_1F_2R_Text_22C89C: @ 822C89C .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "We've lost, dear wife.$" MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1 - .string "JOHN: We’ve been married for\n" + .string "JOHN: We've been married for\n" .string "fifty years.\p" - .string "Come to think of it, I’ve yet to beat\n" + .string "Come to think of it, I've yet to beat\n" .string "my dear wife in a battle.$" MeteorFalls_1F_2R_Text_22C92B: @ 822C92B .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" + .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_22C99C: @ 822C99C @@ -132,14 +123,14 @@ MeteorFalls_1F_2R_Text_22C99C: @ 822C99C .string "arises, will you battle with us again?$" MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6 - .string "JAY: We’ve been married for\n" + .string "JAY: We've been married for\n" .string "fifty years.\p" .string "The bond we share as a couple could\n" .string "never be broken.$" MeteorFalls_1F_2R_Text_22CA44: @ 822CA44 .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "We've lost, my dear husband.$" MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 .string "JAY: Fifty years of marriage…\p" @@ -147,19 +138,19 @@ MeteorFalls_1F_2R_Text_22CA70: @ 822CA70 .string "it with a POKéMON battle…$" MeteorFalls_1F_2R_Text_22CACD: @ 822CACD - .string "JAY: Well, well, aren’t you a young\n" + .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" + .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" MeteorFalls_1F_2R_Text_22CB47: @ 822CB47 - .string "JOHN: We’ve always battled POKéMON\n" + .string "JOHN: We've always battled POKéMON\n" .string "together as a twosome.\l" - .string "We’ve confidence in ourselves.$" + .string "We've confidence in ourselves.$" MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0 .string "JOHN: Oh, my.\n" - .string "We’ve lost, dear wife.$" + .string "We've lost, dear wife.$" MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 .string "JOHN: Married for fifty years…\p" @@ -168,18 +159,18 @@ MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5 MeteorFalls_1F_2R_Text_22CC27: @ 822CC27 .string "JOHN: Well, well, what a young TRAINER!\p" - .string "Will you battle with us? If so, you’ll\n" + .string "Will you battle with us? If so, you'll\n" .string "have to return with more POKéMON.$" MeteorFalls_1F_2R_Text_22CC98: @ 822CC98 - .string "JAY: We’ve been married for\n" + .string "JAY: We've been married for\n" .string "fifty years.\p" - .string "We’ve supported each other all that\n" - .string "time. We’ve made ourselves strong.$" + .string "We've supported each other all that\n" + .string "time. We've made ourselves strong.$" MeteorFalls_1F_2R_Text_22CD08: @ 822CD08 .string "JAY: Oh, dear.\n" - .string "We’ve lost, my dear husband.$" + .string "We've lost, my dear husband.$" MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 .string "JAY: Fifty years of marriage…\n" @@ -188,8 +179,8 @@ MeteorFalls_1F_2R_Text_22CD34: @ 822CD34 .string "happy memories together.$" MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB - .string "JAY: Well, well, aren’t you a young\n" + .string "JAY: Well, well, aren't you a young\n" .string "TRAINER?\p" - .string "If you’d care to battle with us, you’ll\n" + .string "If you'd care to battle with us, you'll\n" .string "have to come back with more POKéMON.$" diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 5226ddb4a..738a7b6cd 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -13,9 +13,9 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 waitmovement 0 applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B1E1, 4 - trainerbattle 3, TRAINER_STEVEN, 0, MeteorFalls_StevensCave_Text_23B32D - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT setflag FLAG_0x4F8 release end @@ -23,26 +23,26 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD applymovement 1, MeteorFalls_StevensCave_Movement_27259E waitmovement 0 - msgbox MeteorFalls_StevensCave_Text_23B358, 4 + msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT release end MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1 .string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n" - .string "I’m amazed you knew where to find me.\p" + .string "I'm amazed you knew where to find me.\p" .string "Do you, uh…maybe think of me as\n" .string "just a rock maniac?\p" - .string "No, that can’t be right.\p" + .string "No, that can't be right.\p" .string "We battled alongside each other at\n" .string "the SOOTOPOLIS SPACE CENTER.\p" .string "You should have a very good idea\n" .string "about how good I am.\p" - .string "Okay, {PLAYER}{KUN}, if you’re going to mount\n" + .string "Okay, {PLAYER}{KUN}, if you're going to mount\n" .string "a serious challenge, expect the worst!$" MeteorFalls_StevensCave_Text_23B32D: @ 823B32D .string "You…\n" - .string "I had no idea you’d become so strong…$" + .string "I had no idea you'd become so strong…$" MeteorFalls_StevensCave_Text_23B358: @ 823B358 .string "STEVEN: Come to think of it, ever since\n" @@ -54,5 +54,5 @@ MeteorFalls_StevensCave_Text_23B358: @ 823B358 .string "And where will you go from here?\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "Fufufu, even I couldn’t tell you that.$" + .string "Fufufu, even I couldn't tell you that.$" diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 6406edd9b..e60180559 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -4,7 +4,7 @@ MirageTower_4F_MapScripts:: @ 823AD47 MirageTower_4F_EventScript_23AD48:: @ 823AD48 lock faceplayer - msgbox MirageTower_4F_Text_23ADF9, 5 + msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23AD7F giveitem_std ITEM_ROOT_FOSSIL @@ -18,14 +18,14 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 end MirageTower_4F_EventScript_23AD7F:: @ 823AD7F - msgbox MirageTower_4F_Text_23AE79, 4 + msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT release end MirageTower_4F_EventScript_23AD89:: @ 823AD89 lock faceplayer - msgbox MirageTower_4F_Text_23AE98, 5 + msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MirageTower_4F_EventScript_23ADC0 giveitem_std ITEM_CLAW_FOSSIL @@ -39,7 +39,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 end MirageTower_4F_EventScript_23ADC0:: @ 823ADC0 - msgbox MirageTower_4F_Text_23AF18, 4 + msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 710770472..fe037074f 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -16,12 +16,12 @@ MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AC7 - msgbox MossdeepCity_Text_1E4E90, 4 + msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 - msgbox MossdeepCity_Text_1E4F15, 4 + msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT release end @@ -30,45 +30,45 @@ MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 faceplayer checkflag FLAG_0x07B goto_eq MossdeepCity_EventScript_1E4AE6 - msgbox MossdeepCity_Text_1E4F50, 4 + msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6 - msgbox MossdeepCity_Text_1E5051, 4 + msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0 - msgbox MossdeepCity_Text_1E4E22, 2 + msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC end MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9 - msgbox MossdeepCity_Text_1E5135, 2 + msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC end MossdeepCity_EventScript_1E4B02:: @ 81E4B02 - msgbox MossdeepCity_Text_1E50D9, 2 + msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC end MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B - msgbox MossdeepCity_Text_1E529D, 2 + msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC end MossdeepCity_EventScript_1E4B14:: @ 81E4B14 - msgbox MossdeepCity_Text_1E5396, 3 + msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D - msgbox MossdeepCity_Text_1E53A9, 3 + msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B26:: @ 81E4B26 - msgbox MossdeepCity_Text_1E53F2, 3 + msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F - msgbox MossdeepCity_Text_1E541F, 3 + msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN end MossdeepCity_EventScript_1E4B38:: @ 81E4B38 @@ -218,7 +218,7 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00 MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer - msgbox MossdeepCity_Text_1E5213, 4 + msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 waitmovement 0 release @@ -229,10 +229,10 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 faceplayer checkflag FLAG_0x114 goto_eq MossdeepCity_EventScript_1E4C68 - msgbox MossdeepCity_Text_1E4CED, 5 + msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_1E4C72 - msgbox MossdeepCity_Text_1E4D5B, 4 + msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_eq MossdeepCity_EventScript_272054 @@ -241,23 +241,23 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 end MossdeepCity_EventScript_1E4C68:: @ 81E4C68 - msgbox MossdeepCity_Text_1E4DB3, 4 + msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C72:: @ 81E4C72 - msgbox MossdeepCity_Text_1E4DD7, 4 + msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT release end MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C - msgbox MossdeepCity_Text_1E5581, 2 + msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC end MossdeepCity_EventScript_1E4C85:: @ 81E4C85 lock faceplayer - msgbox MossdeepCity_Text_1E5453, 4 + msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, MossdeepCity_EventScript_1E4CB0 @@ -312,19 +312,19 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2 step_end MossdeepCity_Text_1E4CED: @ 81E4CED - .string "I got this from STEVEN, but I don’t\n" - .string "know what it’s good for.\p" - .string "I think it’s called KING’S ROCK.\n" + .string "I got this from STEVEN, but I don't\n" + .string "know what it's good for.\p" + .string "I think it's called KING'S ROCK.\n" .string "Do you want it?$" MossdeepCity_Text_1E4D5B: @ 81E4D5B .string "Why would you want it?\n" - .string "You’re weird.\p" + .string "You're weird.\p" .string "You can keep it, but keep it a secret\n" .string "from STEVEN.$" MossdeepCity_Text_1E4DB3: @ 81E4DB3 - .string "STEVEN’s house is right over there!$" + .string "STEVEN's house is right over there!$" MossdeepCity_Text_1E4DD7: @ 81E4DD7 .string "Yeah, you think so, too! What are you\n" @@ -333,19 +333,19 @@ MossdeepCity_Text_1E4DD7: @ 81E4DD7 MossdeepCity_Text_1E4E22: @ 81E4E22 .string "Around MOSSDEEP, you can see wild\n" .string "WAILMER.\p" - .string "It’s called, uh…\n" + .string "It's called, uh…\n" .string "What was it now…\p" .string "WAI, WAI, WAI…\p" .string "WAILMER watching!$" MossdeepCity_Text_1E4E90: @ 81E4E90 - .string "The island’s SPACE CENTER has been\n" + .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.\p" - .string "There’s been some kind of an uproar\n" + .string "There's been some kind of an uproar\n" .string "over a letter they received recently.$" MossdeepCity_Text_1E4F15: @ 81E4F15 - .string "The island’s SPACE CENTER has been\n" + .string "The island's SPACE CENTER has been\n" .string "launching huge rockets.$" MossdeepCity_Text_1E4F50: @ 81E4F50 @@ -353,19 +353,19 @@ MossdeepCity_Text_1E4F50: @ 81E4F50 .string "TEAM AQUA set up shop in LILYCOVE.\p" .string "I also heard that someone came along\n" .string "and wiped the floor with them!\p" - .string "But MOSSDEEP here’s been targeted\n" + .string "But MOSSDEEP here's been targeted\n" .string "by that TEAM MAGMA.\p" - .string "If you want to know what they’re up to,\n" + .string "If you want to know what they're up to,\n" .string "go visit the SPACE CENTER.$" MossdeepCity_Text_1E5051: @ 81E5051 - .string "I’m a SAILOR, so the sea’s obviously\n" + .string "I'm a SAILOR, so the sea's obviously\n" .string "more important to me.\p" .string "But you know? When I get back on land\n" .string "after a long voyage, I do feel relief!$" MossdeepCity_Text_1E50D9: @ 81E50D9 - .string "Wouldn’t it be nice?\p" + .string "Wouldn't it be nice?\p" .string "If the whole world was covered in\n" .string "plants and flowers like this island?$" @@ -382,8 +382,8 @@ MossdeepCity_Text_1E5213: @ 81E5213 .string "A voyage on a ship is fine.\p" .string "But crossing the sea with POKéMON\n" .string "using SURF…\p" - .string "Now that’s an exhilarating trip!\n" - .string "Wouldn’t you agree, youngster?$" + .string "Now that's an exhilarating trip!\n" + .string "Wouldn't you agree, youngster?$" MossdeepCity_Text_1E529D: @ 81E529D .string "This rock has a special meaning to\n" @@ -393,10 +393,10 @@ MossdeepCity_Text_1E529D: @ 81E529D .string "When you make a wish, what do you use?\n" .string "Do you wish upon a star?\p" .string "I use a wish tag to make it happen.\n" - .string "That’s what I do.$" + .string "That's what I do.$" MossdeepCity_Text_1E5396: @ 81E5396 - .string "It’s a white rock.$" + .string "It's a white rock.$" MossdeepCity_Text_1E53A9: @ 81E53A9 .string "MOSSDEEP CITY POKéMON GYM\n" @@ -413,15 +413,15 @@ MossdeepCity_Text_1E541F: @ 81E541F MossdeepCity_Text_1E5453: @ 81E5453 .string "SCOTT: {PLAYER}{KUN}, feeling good?\n" - .string "I’m doing great!\p" - .string "I’d heard MOSSDEEP’s GYM LEADER is\n" + .string "I'm doing great!\p" + .string "I'd heard MOSSDEEP's GYM LEADER is\n" .string "pretty strong, so I decided to come\l" .string "take a look-see for myself.\p" - .string "But there’s something wrong about\n" + .string "But there's something wrong about\n" .string "this town.\p" .string "People are going on about a warning\n" .string "letter and the SPACE CENTER…\p" - .string "I don’t think it concerns me in any\n" + .string "I don't think it concerns me in any\n" .string "way, though.$" MossdeepCity_Text_1E5581: @ 81E5581 diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index ff5c14206..ed10a8309 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -27,13 +27,13 @@ MossdeepCity_GameCorner_1F_EventScript_224B54:: @ 8224B54 end MossdeepCity_GameCorner_1F_EventScript_224B5D:: @ 8224B5D - msgbox MossdeepCity_GameCorner_1F_Text_224BFD, 3 + msgbox MossdeepCity_GameCorner_1F_Text_224BFD, MSGBOX_SIGN end MossdeepCity_GameCorner_1F_Text_224B66: @ 8224B66 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" + .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" @@ -47,12 +47,12 @@ MossdeepCity_GameCorner_1F_Text_224C1C: @ 8224C1C .string "{STR_VAR_1}?$" MossdeepCity_GameCorner_1F_Text_224C64: @ 8224C64 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" + .string "You won't battle? I'm disappointed\n" + .string "that I can't see you battle…$" MossdeepCity_GameCorner_1F_Text_224CA4: @ 8224CA4 .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" + .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 17cf90993..f42b3f4e4 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -49,13 +49,13 @@ MossdeepCity_Gym_EventScript_220885:: @ 8220885 end MossdeepCity_Gym_EventScript_220898:: @ 8220898 - trainerbattle 8, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1 + trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221783, MossdeepCity_Gym_Text_2218EC, MossdeepCity_Gym_Text_221BCE, MossdeepCity_Gym_EventScript_2208D1, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MossdeepCity_Gym_EventScript_22097E checkflag FLAG_0x0AB goto_if 0, MossdeepCity_Gym_EventScript_220937 - msgbox MossdeepCity_Gym_Text_221B1D, 4 + msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 message MossdeepCity_Gym_Text_22196A waitmessage call MossdeepCity_Gym_EventScript_27207E - msgbox MossdeepCity_Gym_Text_221999, 4 + msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT setflag FLAG_0x4F6 setflag FLAG_BADGE07_GET setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS @@ -83,7 +83,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox MossdeepCity_Gym_Text_221AEA, 4 + msgbox MossdeepCity_Gym_Text_221AEA, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -95,7 +95,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_272054 - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB release end @@ -104,13 +104,13 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B giveitem_std ITEM_TM04 compare VAR_RESULT, 0 goto_eq MossdeepCity_Gym_EventScript_27205E - msgbox MossdeepCity_Gym_Text_221A40, 4 + msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT setflag FLAG_0x0AB return MossdeepCity_Gym_EventScript_22097E:: @ 822097E - trainerbattle 7, TRAINER_TATE_AND_LIZA_1, 0, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 - msgbox MossdeepCity_Gym_Text_221E45, 6 + trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_221D0B, MossdeepCity_Gym_Text_221E05, MossdeepCity_Gym_Text_221EB8 + msgbox MossdeepCity_Gym_Text_221E45, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220999:: @ 8220999 @@ -211,63 +211,63 @@ MossdeepCity_Gym_EventScript_220AF1:: @ 8220AF1 end MossdeepCity_Gym_EventScript_220AFD:: @ 8220AFD - trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC - msgbox MossdeepCity_Gym_Text_220ED3, 6 + trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_220E5C, MossdeepCity_Gym_Text_220EAC + msgbox MossdeepCity_Gym_Text_220ED3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B14:: @ 8220B14 - trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A - msgbox MossdeepCity_Gym_Text_220F3A, 6 + trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_220F02, MossdeepCity_Gym_Text_220F1A + msgbox MossdeepCity_Gym_Text_220F3A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B2B:: @ 8220B2B - trainerbattle 0, TRAINER_BLAKE, 0, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 - msgbox MossdeepCity_Gym_Text_221055, 6 + trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_220FB0, MossdeepCity_Gym_Text_221024 + msgbox MossdeepCity_Gym_Text_221055, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B42:: @ 8220B42 - trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 - msgbox MossdeepCity_Gym_Text_22116A, 6 + trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_2210EE, MossdeepCity_Gym_Text_221152 + msgbox MossdeepCity_Gym_Text_22116A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B59:: @ 8220B59 - trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 - msgbox MossdeepCity_Gym_Text_22123D, 6 + trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_2211E2, MossdeepCity_Gym_Text_221230 + msgbox MossdeepCity_Gym_Text_22123D, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B70:: @ 8220B70 - trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 - msgbox MossdeepCity_Gym_Text_22132E, 6 + trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_2212A6, MossdeepCity_Gym_Text_221309 + msgbox MossdeepCity_Gym_Text_22132E, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B87:: @ 8220B87 - trainerbattle 0, TRAINER_SYLVIA, 0, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 - msgbox MossdeepCity_Gym_Text_221412, 6 + trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_2213C2, MossdeepCity_Gym_Text_2213F4 + msgbox MossdeepCity_Gym_Text_221412, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220B9E:: @ 8220B9E - trainerbattle 0, TRAINER_NATE, 0, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 - msgbox MossdeepCity_Gym_Text_2214D3, 6 + trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_221460, MossdeepCity_Gym_Text_2214A7 + msgbox MossdeepCity_Gym_Text_2214D3, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BB5:: @ 8220BB5 - trainerbattle 0, TRAINER_MACEY, 0, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 - msgbox MossdeepCity_Gym_Text_221680, 6 + trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_22161B, MossdeepCity_Gym_Text_221658 + msgbox MossdeepCity_Gym_Text_221680, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BCC:: @ 8220BCC - trainerbattle 0, TRAINER_CLIFFORD, 0, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 - msgbox MossdeepCity_Gym_Text_2215E2, 6 + trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_22157C, MossdeepCity_Gym_Text_2215B8 + msgbox MossdeepCity_Gym_Text_2215E2, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BE3:: @ 8220BE3 - trainerbattle 0, TRAINER_NICHOLAS, 0, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D - msgbox MossdeepCity_Gym_Text_22173A, 6 + trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_2216EE, MossdeepCity_Gym_Text_22172D + msgbox MossdeepCity_Gym_Text_22173A, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA - trainerbattle 0, TRAINER_KATHLEEN, 0, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B - msgbox MossdeepCity_Gym_Text_221545, 6 + trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_221507, MossdeepCity_Gym_Text_22153B + msgbox MossdeepCity_Gym_Text_221545, MSGBOX_AUTOCLOSE end MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 @@ -275,12 +275,12 @@ MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 faceplayer checkflag FLAG_0x4F6 goto_eq MossdeepCity_Gym_EventScript_220C26 - msgbox MossdeepCity_Gym_Text_220CD5, 4 + msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 - msgbox MossdeepCity_Gym_Text_220E2A, 4 + msgbox MossdeepCity_Gym_Text_220E2A, MSGBOX_DEFAULT release end @@ -304,12 +304,12 @@ MossdeepCity_Gym_EventScript_220C43:: @ 8220C43 end MossdeepCity_Gym_EventScript_220C53:: @ 8220C53 - msgbox MossdeepCity_Gym_Text_221CCA, 4 + msgbox MossdeepCity_Gym_Text_221CCA, MSGBOX_DEFAULT releaseall end MossdeepCity_Gym_EventScript_220C5D:: @ 8220C5D - msgbox MossdeepCity_Gym_Text_221CB0, 4 + msgbox MossdeepCity_Gym_Text_221CB0, MSGBOX_DEFAULT releaseall end @@ -374,22 +374,22 @@ MossdeepCity_Gym_EventScript_220CBF:: @ 8220CBF end MossdeepCity_Gym_Text_220CD5: @ 8220CD5 - .string "Yo, how’s it going, CHAMPION-bound\n" + .string "Yo, how's it going, CHAMPION-bound\n" .string "{PLAYER}?\p" .string "The GYM LEADERS here use\n" .string "PSYCHIC-type POKéMON.\p" .string "If you go up against them with\n" .string "FIGHTING- or POISON-type POKéMON,\l" - .string "they’ll inflict horrible damage!\p" - .string "Plus, they’ll come at you with\n" + .string "they'll inflict horrible damage!\p" + .string "Plus, they'll come at you with\n" .string "outstanding combination attacks.\p" - .string "If you want to win, you’ll need to show\n" + .string "If you want to win, you'll need to show\n" .string "them how tight you are with your\l" .string "POKéMON. Go for it!$" MossdeepCity_Gym_Text_220E2A: @ 8220E2A - .string "Wow, you’re astounding!\n" - .string "You’re one great TRAINER!$" + .string "Wow, you're astounding!\n" + .string "You're one great TRAINER!$" MossdeepCity_Gym_Text_220E5C: @ 8220E5C .string "Battles hinge on the strength of your\n" @@ -401,7 +401,7 @@ MossdeepCity_Gym_Text_220EAC: @ 8220EAC MossdeepCity_Gym_Text_220ED3: @ 8220ED3 .string "The indecisive lose.\n" - .string "That’s my warning to you.$" + .string "That's my warning to you.$" MossdeepCity_Gym_Text_220F02: @ 8220F02 .string "Let me see your talent!$" @@ -420,7 +420,7 @@ MossdeepCity_Gym_Text_220FB0: @ 8220FB0 .string "BALL telekinetically!\p" .string "Wrooooooooaaaar!\n" .string "… … … … … … …\p" - .string "Sometimes, I’m out of sync…$" + .string "Sometimes, I'm out of sync…$" MossdeepCity_Gym_Text_221024: @ 8221024 .string "My POKéMON battling skills are out\n" @@ -431,22 +431,22 @@ MossdeepCity_Gym_Text_221055: @ 8221055 .string "psychically. But this dust bunny…\p" .string "Whoooooooooooooooh!\n" .string "… … … … … …\p" - .string "No, I’m not cheating!\n" - .string "I didn’t blow on it! Honestly!$" + .string "No, I'm not cheating!\n" + .string "I didn't blow on it! Honestly!$" MossdeepCity_Gym_Text_2210EE: @ 82210EE - .string "When you lose to me, don’t be too hard\n" + .string "When you lose to me, don't be too hard\n" .string "on yourself.\p" - .string "It’s not that you’re weak--I’m just\n" + .string "It's not that you're weak--I'm just\n" .string "too strong!$" MossdeepCity_Gym_Text_221152: @ 8221152 - .string "You’re just too strong!$" + .string "You're just too strong!$" MossdeepCity_Gym_Text_22116A: @ 822116A - .string "I’m not going to get down on myself for\n" + .string "I'm not going to get down on myself for\n" .string "losing. I just need to train harder.\p" - .string "Positive thinking--that’s my strong\n" + .string "Positive thinking--that's my strong\n" .string "point!$" MossdeepCity_Gym_Text_2211E2: @ 82211E2 @@ -462,16 +462,16 @@ MossdeepCity_Gym_Text_22123D: @ 822123D .string "You will wage a terrifically intense\n" .string "battle with our GYM LEADERS…\p" .string "The result…\n" - .string "You won’t hear it from me!$" + .string "You won't hear it from me!$" MossdeepCity_Gym_Text_2212A6: @ 82212A6 .string "The roads you have traveled…\n" .string "What you have experienced…\p" - .string "Come at me with everything you’ve\n" + .string "Come at me with everything you've\n" .string "learned!$" MossdeepCity_Gym_Text_221309: @ 8221309 - .string "You’ve traveled a path of greatness!$" + .string "You've traveled a path of greatness!$" MossdeepCity_Gym_Text_22132E: @ 822132E .string "A bright future awaits those who have\n" @@ -490,7 +490,7 @@ MossdeepCity_Gym_Text_2213F4: @ 82213F4 MossdeepCity_Gym_Text_221412: @ 8221412 .string "How dare you beat me…\p" - .string "It won’t be my fault if something\n" + .string "It won't be my fault if something\n" .string "horrible befalls you…$" MossdeepCity_Gym_Text_221460: @ 8221460 @@ -503,7 +503,7 @@ MossdeepCity_Gym_Text_2214A7: @ 82214A7 .string "Your battle style is fantastic!$" MossdeepCity_Gym_Text_2214D3: @ 82214D3 - .string "I… I don’t let defeat rattle m-me,\n" + .string "I… I don't let defeat rattle m-me,\n" .string "however b-badly.$" MossdeepCity_Gym_Text_221507: @ 8221507 @@ -530,7 +530,7 @@ MossdeepCity_Gym_Text_2215E2: @ 82215E2 .string "your youthful energy.$" MossdeepCity_Gym_Text_22161B: @ 822161B - .string "You’re not getting through to the end!\n" + .string "You're not getting through to the end!\n" .string "Not if I can help it!$" MossdeepCity_Gym_Text_221658: @ 8221658 @@ -538,7 +538,7 @@ MossdeepCity_Gym_Text_221658: @ 8221658 .string "strong?$" MossdeepCity_Gym_Text_221680: @ 8221680 - .string "Humph! You may be strong, but you’re\n" + .string "Humph! You may be strong, but you're\n" .string "not suitable for the PSYCHIC type!\p" .string "The way you battle is somehow brutal!$" @@ -551,7 +551,7 @@ MossdeepCity_Gym_Text_22172D: @ 822172D .string "Done in!$" MossdeepCity_Gym_Text_22173A: @ 822173A - .string "All right! I think I’ll develop a special\n" + .string "All right! I think I'll develop a special\n" .string "invincible POKéMON power next.$" MossdeepCity_Gym_Text_221783: @ 8221783 @@ -559,9 +559,9 @@ MossdeepCity_Gym_Text_221783: @ 8221783 .string "LIZA: Fufufu… Were you surprised?\p" .string "TATE: That there are two GYM LEADERS?\n" .string "LIZA: That there are two GYM LEADERS?\p" - .string "TATE: We’re twins!\n" - .string "LIZA: We’re twins!\p" - .string "TATE: We don’t need to talk because…\n" + .string "TATE: We're twins!\n" + .string "LIZA: We're twins!\p" + .string "TATE: We don't need to talk because…\n" .string "LIZA: We can each determine what…\p" .string "TATE: The other is thinking…\n" .string "LIZA: All in our minds!\p" @@ -571,7 +571,7 @@ MossdeepCity_Gym_Text_221783: @ 8221783 MossdeepCity_Gym_Text_2218EC: @ 82218EC .string "TATE: What?! Our combination…\n" .string "LIZA: Was shattered!\p" - .string "TATE: It can’t be helped. You’ve won…\n" + .string "TATE: It can't be helped. You've won…\n" .string "LIZA: So, in recognition, take this.$" MossdeepCity_Gym_Text_22196A: @ 822196A @@ -590,7 +590,7 @@ MossdeepCity_Gym_Text_221A40: @ 8221A40 .string "LIZA: CALM MIND!\p" .string "TATE: It raises SP. ATK and…\n" .string "LIZA: It raises SP. DEF!\p" - .string "TATE: It’s a move that’s perfect…\n" + .string "TATE: It's a move that's perfect…\n" .string "LIZA: For PSYCHIC POKéMON!\p" .string "… … … … … …$" @@ -603,14 +603,14 @@ MossdeepCity_Gym_Text_221B1D: @ 8221B1D .string "and your POKéMON is far stronger than\l" .string "the bond that we share as twins.\p" .string "LIZA: You will become even stronger!\n" - .string "We’ve battled you, so we know.$" + .string "We've battled you, so we know.$" MossdeepCity_Gym_Text_221BCE: @ 8221BCE .string "TATE: Hehehe… Were you surprised?\p" .string "LIZA: That there are two GYM LEADERS?\p" .string "TATE: Oops, you have only one…\n" .string "LIZA: POKéMON that can battle.\p" - .string "TATE: We can’t battle that way!\p" + .string "TATE: We can't battle that way!\p" .string "LIZA: If you want to challenge us,\n" .string "bring some more POKéMON.$" @@ -619,34 +619,34 @@ MossdeepCity_Gym_Text_221CB0: @ 8221CB0 MossdeepCity_Gym_Text_221CCA: @ 8221CCA .string "MOSSDEEP CITY POKéMON GYM\p" - .string "LIZA AND TATE’S CERTIFIED TRAINERS:\n" + .string "LIZA AND TATE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" MossdeepCity_Gym_Text_221D0B: @ 8221D0B .string "TATE: POKéMON…\n" .string "LIZA: POKéMON…\p" - .string "TATE: By changing the party’s mix…\n" + .string "TATE: By changing the party's mix…\n" .string "LIZA: The battle style changes.\p" .string "TATE: But me…\n" .string "LIZA: But me…\p" - .string "TATE: I’ll always be with LIZA!\n" - .string "LIZA: I’ll always be with TATE!\p" + .string "TATE: I'll always be with LIZA!\n" + .string "LIZA: I'll always be with TATE!\p" .string "TATE: Our combination…\n" - .string "LIZA: We’ll show you again and again!$" + .string "LIZA: We'll show you again and again!$" MossdeepCity_Gym_Text_221E05: @ 8221E05 .string "TATE: You and your POKéMON…\n" - .string "LIZA: It’s as if you were siblings!$" + .string "LIZA: It's as if you were siblings!$" MossdeepCity_Gym_Text_221E45: @ 8221E45 .string "TATE: You can knock us down,\n" - .string "but we’ll never stay down!\p" + .string "but we'll never stay down!\p" .string "LIZA: Because the two of us,\n" .string "we always support each other!$" MossdeepCity_Gym_Text_221EB8: @ 8221EB8 - .string "TATE: You’re back again…\n" - .string "LIZA: You’re back again…\p" + .string "TATE: You're back again…\n" + .string "LIZA: You're back again…\p" .string "TATE: To give us a rematch.\n" .string "LIZA: To give us a rematch.\p" .string "TATE: But…\n" diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index b08d296c7..4a5da3b16 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -5,21 +5,21 @@ MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6 lock faceplayer bufferleadmonspeciesname 0 - msgbox MossdeepCity_House1_Text_22200F, 4 + msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT specialvar VAR_RESULT, GetPokeblockNameByMonNature compare VAR_RESULT, 0 goto_eq MossdeepCity_House1_EventScript_221FFC - msgbox MossdeepCity_House1_Text_22201D, 4 + msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC - msgbox MossdeepCity_House1_Text_222068, 4 + msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT release end MossdeepCity_House1_EventScript_222006:: @ 8222006 - msgbox MossdeepCity_House1_Text_222099, 2 + msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC end MossdeepCity_House1_Text_22200F: @ 822200F @@ -28,12 +28,12 @@ MossdeepCity_House1_Text_22200F: @ 822200F MossdeepCity_House1_Text_22201D: @ 822201D .string "It likes {STR_VAR_1}S,\n" - .string "doesn’t it?\p" - .string "No, I’m positive of it! It definitely\n" + .string "doesn't it?\p" + .string "No, I'm positive of it! It definitely\n" .string "likes {STR_VAR_1}S!$" MossdeepCity_House1_Text_222068: @ 8222068 - .string "It doesn’t appear to like or dislike\n" + .string "It doesn't appear to like or dislike\n" .string "any {POKEBLOCK}S.$" MossdeepCity_House1_Text_222099: @ 8222099 diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index 410fa1df7..863bb4eda 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -2,11 +2,11 @@ MossdeepCity_House2_MapScripts:: @ 82220DE .byte 0 MossdeepCity_House2_EventScript_2220DF:: @ 82220DF - msgbox MossdeepCity_House2_Text_222146, 2 + msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220E8:: @ 82220E8 - msgbox MossdeepCity_House2_Text_2221A6, 2 + msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC end MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 @@ -14,7 +14,7 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox MossdeepCity_House2_Text_22222E, 4 + msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT waitmoncry closemessage setflag FLAG_0x0E0 @@ -56,13 +56,13 @@ MossdeepCity_House2_Movement_222141: @ 8222141 MossdeepCity_House2_Text_222146: @ 8222146 .string "My little sister exchanges MAIL with\n" .string "her boyfriend in FORTREE.\p" - .string "I don’t envy her one bit at all.$" + .string "I don't envy her one bit at all.$" MossdeepCity_House2_Text_2221A6: @ 82221A6 - .string "Even though I can’t see my friend in\n" + .string "Even though I can't see my friend in\n" .string "FORTREE, my POKéMON carries MAIL\l" .string "back and forth for us.\p" - .string "I’m not lonesome, even though we’re\n" + .string "I'm not lonesome, even though we're\n" .string "apart.$" MossdeepCity_House2_Text_22222E: @ 822222E diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index dfdbfa956..2d4fd04ad 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -6,23 +6,23 @@ MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 faceplayer checkflag FLAG_0x098 goto_eq MossdeepCity_House3_EventScript_222602 - msgbox MossdeepCity_House3_Text_222616, 5 + msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_House3_EventScript_22260C - msgbox MossdeepCity_House3_Text_2226B6, 4 + msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD setflag FLAG_0x098 - msgbox MossdeepCity_House3_Text_2226F0, 4 + msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_222602:: @ 8222602 - msgbox MossdeepCity_House3_Text_222751, 4 + msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT release end MossdeepCity_House3_EventScript_22260C:: @ 822260C - msgbox MossdeepCity_House3_Text_222733, 4 + msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT release end @@ -32,19 +32,19 @@ MossdeepCity_House3_Text_222616: @ 8222616 .string "Say all you want, but this baby can\n" .string "catch POKéMON off the seafloor!\p" .string "What do you think?\n" - .string "You want it, don’t you?$" + .string "You want it, don't you?$" MossdeepCity_House3_Text_2226B6: @ 82226B6 .string "You bet, you bet!\n" .string "After all, a SUPER ROD is really super!$" MossdeepCity_House3_Text_2226F0: @ 82226F0 - .string "If there’s any water, try dropping in\n" + .string "If there's any water, try dropping in\n" .string "your ROD and see what bites!$" MossdeepCity_House3_Text_222733: @ 8222733 .string "Hunh?\n" - .string "Don’t you like to fish?$" + .string "Don't you like to fish?$" MossdeepCity_House3_Text_222751: @ 8222751 .string "Go after the seafloor POKéMON with\n" diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index cb3cc0d16..627340b5c 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -6,12 +6,12 @@ MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq MossdeepCity_House4_EventScript_222DED - msgbox MossdeepCity_House4_Text_222E31, 4 + msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222DED:: @ 8222DED - msgbox MossdeepCity_House4_Text_222E73, 4 + msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT release end @@ -22,12 +22,12 @@ MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 compare VAR_RESULT, 0 goto_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName - msgbox MossdeepCity_House4_Text_222ECC, 4 + msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT release end MossdeepCity_House4_EventScript_222E14:: @ 8222E14 - msgbox MossdeepCity_House4_Text_222EF7, 4 + msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT release end @@ -36,18 +36,18 @@ MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox MossdeepCity_House4_Text_222F31, 4 + msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT waitmoncry release end MossdeepCity_House4_Text_222E31: @ 8222E31 .string "My little brother says he likes to go\n" - .string "find people’s SECRET BASES.$" + .string "find people's SECRET BASES.$" MossdeepCity_House4_Text_222E73: @ 8222E73 .string "My little brother says he likes to\n" - .string "visit people’s SECRET BASES and have\l" + .string "visit people's SECRET BASES and have\l" .string "POKéMON battles.$" MossdeepCity_House4_Text_222ECC: @ 8222ECC @@ -56,7 +56,7 @@ MossdeepCity_House4_Text_222ECC: @ 8222ECC MossdeepCity_House4_Text_222EF7: @ 8222EF7 .string "You should make a SECRET BASE\n" - .string "somewhere. I’ll go find it!$" + .string "somewhere. I'll go find it!$" MossdeepCity_House4_Text_222F31: @ 8222F31 .string "SKITTY: Miyaan?$" diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index ed7ecd035..11c911c45 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_Mart_EventScript_2223C8:: @ 82223C8 message gUnknown_08272A21 waitmessage pokemart MossdeepCity_Mart_Pokemart_2223E0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -27,22 +27,22 @@ MossdeepCity_Mart_Pokemart_2223E0: @ 82223E0 end MossdeepCity_Mart_EventScript_2223F6:: @ 82223F6 - msgbox MossdeepCity_Mart_Text_222411, 2 + msgbox MossdeepCity_Mart_Text_222411, MSGBOX_NPC end MossdeepCity_Mart_EventScript_2223FF:: @ 82223FF - msgbox MossdeepCity_Mart_Text_2224A0, 2 + msgbox MossdeepCity_Mart_Text_2224A0, MSGBOX_NPC end MossdeepCity_Mart_EventScript_222408:: @ 8222408 - msgbox MossdeepCity_Mart_Text_2224FA, 2 + msgbox MossdeepCity_Mart_Text_2224FA, MSGBOX_NPC end MossdeepCity_Mart_Text_222411: @ 8222411 .string "REVIVE is fantastic!\p" .string "Give it to a fainted POKéMON,\n" .string "and the POKéMON will arise.\p" - .string "But be careful, REVIVE doesn’t restore\n" + .string "But be careful, REVIVE doesn't restore\n" .string "the used-up PP of moves.$" MossdeepCity_Mart_Text_2224A0: @ 82224A0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 2ff03b7f3..28573a3c1 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -16,11 +16,11 @@ MossdeepCity_PokemonCenter_1F_EventScript_22224E:: @ 822224E end MossdeepCity_PokemonCenter_1F_EventScript_22225C:: @ 822225C - msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_22226E, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_EventScript_222265:: @ 8222265 - msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, 2 + msgbox MossdeepCity_PokemonCenter_1F_Text_2222D9, MSGBOX_NPC end MossdeepCity_PokemonCenter_1F_Text_22226E: @ 822226E diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 142bce560..e8fbb6e02 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -18,7 +18,7 @@ MossdeepCity_PokemonCenter_2F_EventScript_222355:: @ 8222355 end MossdeepCity_PokemonCenter_2F_EventScript_22235B:: @ 822235B - msgbox MossdeepCity_PokemonCenter_2F_Text_222364, 2 + msgbox MossdeepCity_PokemonCenter_2F_Text_222364, MSGBOX_NPC end MossdeepCity_PokemonCenter_2F_Text_222364: @ 8222364 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 2edf6d251..32eac1540 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -66,11 +66,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8 end MossdeepCity_SpaceCenter_1F_EventScript_223012:: @ 8223012 - msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232A7, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22301B:: @ 822301B - msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2232C8, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 @@ -88,11 +88,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024 end MossdeepCity_SpaceCenter_1F_EventScript_223051:: @ 8223051 - msgbox MossdeepCity_SpaceCenter_1F_Text_223305, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223305, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_22305A:: @ 822305A - msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22335E, MSGBOX_DEFAULT return MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 @@ -100,12 +100,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063 faceplayer compare VAR_0x405D, 2 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2233D3, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A - msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -118,36 +118,36 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_2230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223540, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA checkflag FLAG_0x0C0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 setflag FLAG_0x0C0 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release end MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 - msgbox MossdeepCity_SpaceCenter_1F_Text_223664, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 release @@ -166,12 +166,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22312D:: @ 822312D end MossdeepCity_SpaceCenter_1F_EventScript_223154:: @ 8223154 - msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236A6, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_1F_EventScript_22315E:: @ 822315E - msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2236E8, MSGBOX_DEFAULT release end @@ -188,7 +188,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223168:: @ 8223168 end MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F - msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_22375B, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -196,7 +196,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22318F:: @ 822318F end MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 - msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_2237B5, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 @@ -206,7 +206,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231A4:: @ 82231A4 MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 lock faceplayer - msgbox MossdeepCity_SpaceCenter_1F_Text_223849, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223849, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A2 waitmovement 0 release @@ -214,23 +214,23 @@ MossdeepCity_SpaceCenter_1F_EventScript_2231B9:: @ 82231B9 MossdeepCity_SpaceCenter_1F_EventScript_2231CF:: @ 82231CF lockall - msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223C2C, MSGBOX_DEFAULT releaseall end MossdeepCity_SpaceCenter_1F_EventScript_2231DA:: @ 82231DA - trainerbattle 0, TRAINER_GRUNT_32, 0, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 - msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, 6 + trainerbattle_single TRAINER_GRUNT_32, MossdeepCity_SpaceCenter_1F_Text_22396C, MossdeepCity_SpaceCenter_1F_Text_223999 + msgbox MossdeepCity_SpaceCenter_1F_Text_2239AA, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_2231F1:: @ 82231F1 - trainerbattle 0, TRAINER_GRUNT_16, 0, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 - msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, 6 + trainerbattle_single TRAINER_GRUNT_16, MossdeepCity_SpaceCenter_1F_Text_2239E6, MossdeepCity_SpaceCenter_1F_Text_223A21 + msgbox MossdeepCity_SpaceCenter_1F_Text_223A4B, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 - trainerbattle 0, TRAINER_GRUNT_33, 0, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA - msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, 6 + trainerbattle_single TRAINER_GRUNT_33, MossdeepCity_SpaceCenter_1F_Text_223A8A, MossdeepCity_SpaceCenter_1F_Text_223AFA + msgbox MossdeepCity_SpaceCenter_1F_Text_223B37, MSGBOX_AUTOCLOSE end MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F @@ -238,8 +238,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F faceplayer checkflag FLAG_0x0BF goto_eq MossdeepCity_SpaceCenter_1F_EventScript_22326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, 4 - trainerbattle 3, TRAINER_GRUNT_23, 0, MossdeepCity_SpaceCenter_1F_Text_223BC2 + msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 setflag FLAG_0x0BF moveobjectoffscreen 9 switch VAR_FACING @@ -252,7 +252,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F end MossdeepCity_SpaceCenter_1F_EventScript_22326E:: @ 822326E - msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, 4 + msgbox MossdeepCity_SpaceCenter_1F_Text_223BD3, MSGBOX_DEFAULT release end @@ -290,41 +290,41 @@ MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 step_end MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 - .string "The rocket’s launch is imminent!$" + .string "The rocket's launch is imminent!$" MossdeepCity_SpaceCenter_1F_Text_2232C8: @ 82232C8 .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" + .string "That's successful launch no. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_223305: @ 8223305 .string "I know that things are a little\n" .string "haywire right now, but…\p" - .string "The rocket’s launch is imminent!$" + .string "The rocket's launch is imminent!$" MossdeepCity_SpaceCenter_1F_Text_22335E: @ 822335E .string "I know that things are a little\n" .string "haywire right now, but…\p" .string "The rocket launched safely!\n" - .string "That’s successful launch no. {STR_VAR_1}!$" + .string "That's successful launch no. {STR_VAR_1}!$" MossdeepCity_SpaceCenter_1F_Text_2233D3: @ 82233D3 .string "A rocket launch demands perfection.\n" .string "Not even a 1% margin of error is allowed.\p" - .string "Even if it’s 99% okay, the whole thing\n" + .string "Even if it's 99% okay, the whole thing\n" .string "is useless if 1% happens to be no good.\p" .string "Despite that, we never stop trying.\n" - .string "Why? It’s a dream that never ends.$" + .string "Why? It's a dream that never ends.$" MossdeepCity_SpaceCenter_1F_Text_2234B7: @ 82234B7 .string "Those MAGMA thugs have their sights\n" .string "set on our SPACE CENTER.\p" - .string "But we can’t allow anything that minor\n" + .string "But we can't allow anything that minor\n" .string "to interfere with our rocket launch!$" MossdeepCity_SpaceCenter_1F_Text_223540: @ 8223540 .string "I was taking a stroll down the beach\n" .string "when I found this.\p" - .string "It’s not anything I need, so you can\n" + .string "It's not anything I need, so you can\n" .string "have it.$" MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 @@ -332,14 +332,14 @@ MossdeepCity_SpaceCenter_1F_Text_2235A6: @ 82235A6 .string "its meteor showers for a long time.$" MossdeepCity_SpaceCenter_1F_Text_2235F0: @ 82235F0 - .string "TEAM MAGMA can’t be allowed to steal\n" + .string "TEAM MAGMA can't be allowed to steal\n" .string "the rocket fuel.\p" .string "Oh, by the way, you can have this stone\n" .string "I found on the beach.$" MossdeepCity_SpaceCenter_1F_Text_223664: @ 8223664 .string "With TEAM MAGMA around, I guess\n" - .string "strolls on the beach aren’t safe.$" + .string "strolls on the beach aren't safe.$" MossdeepCity_SpaceCenter_1F_Text_2236A6: @ 82236A6 .string "Some people claim that POKéMON came\n" @@ -349,7 +349,7 @@ MossdeepCity_SpaceCenter_1F_Text_2236E8: @ 82236E8 .string "TEAM AQUA should take care of\n" .string "TEAM MAGMA!\p" .string "But if they did that, TEAM AQUA will\n" - .string "become bold and brazen, won’t they?$" + .string "become bold and brazen, won't they?$" MossdeepCity_SpaceCenter_1F_Text_22375B: @ 822375B .string "A giant chunk of metal bursts through\n" @@ -361,46 +361,46 @@ MossdeepCity_SpaceCenter_1F_Text_2237B5: @ 82237B5 .string "the skies and flies into space…\p" .string "But TEAM MAGMA wants to spoil\n" .string "that dream of mine!\p" - .string "I’m not having any of that!$" + .string "I'm not having any of that!$" MossdeepCity_SpaceCenter_1F_Text_223849: @ 8223849 .string "STEVEN: {PLAYER}{KUN}, have you read that\n" .string "proclamation already?\p" .string "TEAM MAGMA is coming after the rocket\n" .string "fuel on this island.\p" - .string "I don’t know what they’d need it for,\n" - .string "but they can’t be allowed to take it.\p" - .string "I’ll keep an eye on things for\n" + .string "I don't know what they'd need it for,\n" + .string "but they can't be allowed to take it.\p" + .string "I'll keep an eye on things for\n" .string "a while longer.\p" - .string "In the meantime, why don’t you go\n" + .string "In the meantime, why don't you go\n" .string "check out the town?$" MossdeepCity_SpaceCenter_1F_Text_22396C: @ 822396C - .string "As promised, we’ve come for\n" + .string "As promised, we've come for\n" .string "the rocket fuel!$" MossdeepCity_SpaceCenter_1F_Text_223999: @ 8223999 .string "Ran out of fuel…$" MossdeepCity_SpaceCenter_1F_Text_2239AA: @ 82239AA - .string "Don’t think you’re on a roll just\n" - .string "because you’ve beaten me!$" + .string "Don't think you're on a roll just\n" + .string "because you've beaten me!$" MossdeepCity_SpaceCenter_1F_Text_2239E6: @ 82239E6 .string "We gave you fair warning!\n" - .string "There’s nothing sneaky about us!$" + .string "There's nothing sneaky about us!$" MossdeepCity_SpaceCenter_1F_Text_223A21: @ 8223A21 .string "Grrr…\n" - .string "We should’ve used sneaky treachery…$" + .string "We should've used sneaky treachery…$" MossdeepCity_SpaceCenter_1F_Text_223A4B: @ 8223A4B .string "Okay, I get it already! The next time,\n" - .string "we’ll come unannounced.$" + .string "we'll come unannounced.$" MossdeepCity_SpaceCenter_1F_Text_223A8A: @ 8223A8A .string "The rocket fuel the SPACE CENTER has\n" - .string "in storage--that’s what we’re after.\p" + .string "in storage--that's what we're after.\p" .string "We mean to take every last bit of it!$" MossdeepCity_SpaceCenter_1F_Text_223AFA: @ 8223AFA @@ -432,7 +432,7 @@ MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C .string "How are you? We are doing fine.\p" .string "“We will soon visit you to take your\n" .string "rocket fuel.\p" - .string "“Please don’t try to stop us.\n" + .string "“Please don't try to stop us.\n" .string "We will take the fuel no matter what.\p" .string "“Let there be more land!\n" .string " TEAM MAGMA”$" diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 424ee4bf3..3c31ec06c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -36,10 +36,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_27259A waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243A4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2243FE, MSGBOX_DEFAULT closemessage applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_223E07 waitmovement 0 @@ -53,20 +53,20 @@ MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 - msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, 4 - trainerbattle 3, TRAINER_GRUNT_34, 0, MossdeepCity_SpaceCenter_2F_Text_224461 + msgbox MossdeepCity_SpaceCenter_2F_Text_22442D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A4 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, 4 - trainerbattle 3, TRAINER_GRUNT_35, 0, MossdeepCity_SpaceCenter_2F_Text_224499 + msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 waitmovement 0 applymovement 255, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, 4 - trainerbattle 3, TRAINER_GRUNT_36, 0, MossdeepCity_SpaceCenter_2F_Text_2244F1 + msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 applymovement 7, MossdeepCity_SpaceCenter_2F_Movement_223E89 waitmovement 0 setvar VAR_0x409F, 2 @@ -107,12 +107,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D end MossdeepCity_SpaceCenter_2F_EventScript_223EB4:: @ 8223EB4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2241A1, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EBE:: @ 8223EBE - msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22420C, MSGBOX_DEFAULT release end @@ -129,12 +129,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_223EC8:: @ 8223EC8 end MossdeepCity_SpaceCenter_2F_EventScript_223EEF:: @ 8223EEF - msgbox MossdeepCity_SpaceCenter_2F_Text_224253, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224253, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223EF9:: @ 8223EF9 - msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2242C5, MSGBOX_DEFAULT release end @@ -151,31 +151,31 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F03:: @ 8223F03 end MossdeepCity_SpaceCenter_2F_EventScript_223F2A:: @ 8223F2A - msgbox MossdeepCity_SpaceCenter_2F_Text_224342, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224342, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F34:: @ 8223F34 - msgbox MossdeepCity_SpaceCenter_2F_Text_224376, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224376, MSGBOX_DEFAULT release end MossdeepCity_SpaceCenter_2F_EventScript_223F3E:: @ 8223F3E - msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_22452C, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F47:: @ 8223F47 - msgbox MossdeepCity_SpaceCenter_2F_Text_224570, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_224570, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F50:: @ 8223F50 - msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, 2 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245AF, MSGBOX_NPC end MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 lock faceplayer - msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2245D9, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725A2 waitmovement 0 release @@ -183,7 +183,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F59:: @ 8223F59 MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F lockall - msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_22467B, MSGBOX_DEFAULT releaseall end @@ -192,8 +192,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A checkflag FLAG_0x0CD goto_eq MossdeepCity_SpaceCenter_2F_EventScript_223FDA setflag FLAG_0x0CD - msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, 4 - msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT + msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT closemessage delay 30 playse SE_KOUKA_L @@ -237,10 +237,10 @@ MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_27259E waitmovement 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, 5 + msgbox MossdeepCity_SpaceCenter_2F_Text_2247FF, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C - msgbox MossdeepCity_SpaceCenter_2F_Text_224854, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA waitmovement 0 @@ -278,7 +278,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 waitstate MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 - msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT closemessage delay 20 applymovement 9, MossdeepCity_SpaceCenter_2F_Movement_2725A4 @@ -289,7 +289,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 applymovement 8, MossdeepCity_SpaceCenter_2F_Movement_2725A8 waitmovement 0 delay 20 - msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT closemessage setvar VAR_0x405D, 3 fadedefaultbgm @@ -311,7 +311,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 turnobject 1, 2 call MossdeepCity_SpaceCenter_2F_EventScript_224131 fadescreen 0 - msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, 4 + msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT closemessage fadescreen 1 setflag FLAG_0x075 @@ -343,11 +343,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_224152:: @ 8224152 return MossdeepCity_SpaceCenter_2F_EventScript_224157:: @ 8224157 - trainerbattle 10, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C + trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_22487C, MossdeepCity_SpaceCenter_2F_Text_22487C end MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166 - trainerbattle 11, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD + trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_2248AD, MossdeepCity_SpaceCenter_Text_2248AD end MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 @@ -375,7 +375,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22419A:: @ 822419A MossdeepCity_SpaceCenter_2F_Text_2241A1: @ 82241A1 .string "MOSSDEEP has mainly sunny weather,\n" .string "and its winds are stable.\p" - .string "It’s an ideal location for launching\n" + .string "It's an ideal location for launching\n" .string "rockets.$" MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C @@ -385,13 +385,13 @@ MossdeepCity_SpaceCenter_2F_Text_22420C: @ 822420C MossdeepCity_SpaceCenter_2F_Text_224253: @ 8224253 .string "If only I was a little younger, I would\n" .string "have liked being an astronaut…\p" - .string "No… It’s not too late!\n" + .string "No… It's not too late!\n" .string "I can and will try!$" MossdeepCity_SpaceCenter_2F_Text_2242C5: @ 82242C5 .string "If TEAM MAGMA takes the rocket fuel,\n" - .string "I won’t be able to go to space!\p" - .string "They can’t be allowed to get away\n" + .string "I won't be able to go to space!\p" + .string "They can't be allowed to get away\n" .string "with such an outrage!$" MossdeepCity_SpaceCenter_2F_Text_224342: @ 8224342 @@ -403,25 +403,25 @@ MossdeepCity_SpaceCenter_2F_Text_224376: @ 8224376 .string "Do they want to go to space, too?$" MossdeepCity_SpaceCenter_2F_Text_2243A4: @ 82243A4 - .string "What’s wrong with you?\p" - .string "You’re outnumbered three to one,\n" + .string "What's wrong with you?\p" + .string "You're outnumbered three to one,\n" .string "but you still want to take us on?$" MossdeepCity_SpaceCenter_2F_Text_2243FE: @ 82243FE .string "Good answer!\n" - .string "That’s what a smart person’ll do!$" + .string "That's what a smart person'll do!$" MossdeepCity_SpaceCenter_2F_Text_22442D: @ 822442D .string "A reckless go-getter, are you?\n" - .string "Okay, I’ll go first!$" + .string "Okay, I'll go first!$" MossdeepCity_SpaceCenter_2F_Text_224461: @ 8224461 .string "I lost!\n" .string "But!$" MossdeepCity_SpaceCenter_2F_Text_22446E: @ 822446E - .string "It’s too soon to be relieved!\n" - .string "I’m up next!$" + .string "It's too soon to be relieved!\n" + .string "I'm up next!$" MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 .string "I lost, too!\n" @@ -429,11 +429,11 @@ MossdeepCity_SpaceCenter_2F_Text_224499: @ 8224499 MossdeepCity_SpaceCenter_2F_Text_2244AB: @ 82244AB .string "I bet you want to take a break.\n" - .string "But I’m not about to let you do that!$" + .string "But I'm not about to let you do that!$" MossdeepCity_SpaceCenter_2F_Text_2244F1: @ 82244F1 - .string "We should’ve taken a break…\n" - .string "That’s what we should’ve done…$" + .string "We should've taken a break…\n" + .string "That's what we should've done…$" MossdeepCity_SpaceCenter_2F_Text_22452C: @ 822452C .string "Three of us here, and look at the sorry\n" @@ -450,34 +450,34 @@ MossdeepCity_SpaceCenter_2F_Text_2245AF: @ 82245AF MossdeepCity_SpaceCenter_2F_Text_2245D9: @ 82245D9 .string "Hehehe!\p" .string "We come all the way here to get some\n" - .string "fuel, and we’re interfered with again!\p" - .string "If you’re going to mess with us too,\n" - .string "we’ll take care of you at the same time!$" + .string "fuel, and we're interfered with again!\p" + .string "If you're going to mess with us too,\n" + .string "we'll take care of you at the same time!$" MossdeepCity_SpaceCenter_2F_Text_22467B: @ 822467B .string "MAXIE: Clear out of the way!\n" - .string "Don’t you dare interfere!$" + .string "Don't you dare interfere!$" MossdeepCity_SpaceCenter_2F_Text_2246B2: @ 82246B2 .string "STEVEN: TEAM MAGMA…\p" - .string "What’s the point of stealing rocket\n" + .string "What's the point of stealing rocket\n" .string "fuel?$" MossdeepCity_SpaceCenter_2F_Text_2246F0: @ 82246F0 - .string "MAXIE: Fufufu… Since you’re so\n" + .string "MAXIE: Fufufu… Since you're so\n" .string "curious, you deserve an explanation.\p" - .string "We’re going to jettison the entire\n" + .string "We're going to jettison the entire\n" .string "load into MT. CHIMNEY!\p" .string "With GROUDON gone, we have no need\n" .string "for that slag heap of a mountain!\p" - .string "So we’ll use the fuel’s power to make\n" + .string "So we'll use the fuel's power to make\n" .string "the volcano erupt!\p" .string "It will be savage!$" MossdeepCity_SpaceCenter_2F_Text_2247FF: @ 82247FF .string "STEVEN: {PLAYER}{KUN}!\n" - .string "You’re going to help me?\p" - .string "Let’s go into battle together!\n" + .string "You're going to help me?\p" + .string "Let's go into battle together!\n" .string "Are you ready?$" MossdeepCity_SpaceCenter_2F_Text_224854: @ 8224854 @@ -489,7 +489,7 @@ MossdeepCity_SpaceCenter_2F_Text_22487C: @ 822487C .string "I just want to expand the land mass…$" MossdeepCity_SpaceCenter_Text_2248AD: @ 82248AD - .string "I’m with our leader…$" + .string "I'm with our leader…$" MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "MAXIE: We failed to make the volcano\n" @@ -503,7 +503,7 @@ MossdeepCity_SpaceCenter_2F_Text_2248C2: @ 82248C2 .string "If…\n" .string "If we, TEAM MAGMA, are wrong…\l" .string "… … … … … …\p" - .string "Then might TEAM AQUA’s goal to expand\n" + .string "Then might TEAM AQUA's goal to expand\n" .string "the sea also be equally misguided?$" MossdeepCity_SpaceCenter_2F_Text_2249DC: @ 82249DC @@ -519,6 +519,6 @@ MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A .string "thanks for your support.\p" .string "Please come see me at home\n" .string "after this.\p" - .string "Oh, yes, I don’t live in RUSTBORO CITY.\n" + .string "Oh, yes, I don't live in RUSTBORO CITY.\n" .string "I live right here on this island.$" diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index ca24cebb7..297af90d3 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -38,11 +38,11 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_222833 waitmovement 0 - msgbox MossdeepCity_StevensHouse_Text_222936, 4 + msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT giveitem_std ITEM_HM08 setflag FLAG_0x07B setflag FLAG_0x12E - msgbox MossdeepCity_StevensHouse_Text_222A0E, 4 + msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_22283B @@ -73,14 +73,14 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 lockall - msgbox MossdeepCity_StevensHouse_Text_222B9E, 5 + msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_22285B goto MossdeepCity_StevensHouse_EventScript_222865 end MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B - msgbox MossdeepCity_StevensHouse_Text_222C2A, 4 + msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT releaseall end @@ -96,7 +96,7 @@ MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865 MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_222901 call MossdeepCity_StevensHouse_EventScript_27378B @@ -106,7 +106,7 @@ MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895 MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD call MossdeepCity_StevensHouse_EventScript_2228EB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MossdeepCity_StevensHouse_EventScript_2228E0 call MossdeepCity_StevensHouse_EventScript_273797 @@ -135,16 +135,16 @@ MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 end MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909 - msgbox MossdeepCity_StevensHouse_Text_222D97, 3 + msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN end MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912 - msgbox MossdeepCity_StevensHouse_Text_222B11, 2 + msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC end MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B lockall - msgbox MossdeepCity_StevensHouse_Text_222C4E, 4 + msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT releaseall end @@ -155,26 +155,26 @@ MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 MossdeepCity_StevensHouse_Text_222936: @ 8222936 .string "STEVEN: {PLAYER}{KUN}…\p" - .string "As you can see, there’s not much here,\n" + .string "As you can see, there's not much here,\n" .string "but this is my home.\p" - .string "Thank you for all that you’ve done.\p" + .string "Thank you for all that you've done.\p" .string "This is my token of appreciation.\n" - .string "It’s the HIDDEN MACHINE DIVE.\p" - .string "No need to be shy--you’ve earned\n" + .string "It's the HIDDEN MACHINE DIVE.\p" + .string "No need to be shy--you've earned\n" .string "this HM.$" MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E - .string "STEVEN: While you’re using SURF, you\n" + .string "STEVEN: While you're using SURF, you\n" .string "should notice dark patches of water.\p" .string "Use DIVE if you come to deep water\n" - .string "like it. You’ll drop to the seafloor.\p" + .string "like it. You'll drop to the seafloor.\p" .string "When you want to come back up, use\n" .string "DIVE again.\p" - .string "In some places, it won’t be possible\n" + .string "In some places, it won't be possible\n" .string "for you to surface, though.$" MossdeepCity_StevensHouse_Text_222B11: @ 8222B11 - .string "STEVEN: Apparently, there’s an\n" + .string "STEVEN: Apparently, there's an\n" .string "underwater cavern between\l" .string "MOSSDEEP and SOOTOPOLIS.\p" .string "You know, the one that CAPT. STERN\n" @@ -197,23 +197,23 @@ MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A .string "it was.$" MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E - .string "It’s a letter.\p" + .string "It's a letter.\p" .string "… … … … … …\p" .string "To {PLAYER}{KUN}…\p" - .string "I’ve decided to do a little soul-\n" + .string "I've decided to do a little soul-\n" .string "searching and train on the road.\p" - .string "I don’t plan to return home for some\n" + .string "I don't plan to return home for some\n" .string "time.\p" .string "I have a favor to ask of you.\p" .string "I want you to take the POKé BALL on\n" .string "the desk.\p" .string "Inside it is a BELDUM, my favorite\n" .string "POKéMON.\p" - .string "I’m counting on you.\p" + .string "I'm counting on you.\p" .string "May our paths cross someday.\p" .string "STEVEN STONE$" MossdeepCity_StevensHouse_Text_222D97: @ 8222D97 - .string "It’s a collection of rare rocks and\n" + .string "It's a collection of rare rocks and\n" .string "stones assembled by STEVEN.$" diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index c727c735b..88df5692e 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -26,17 +26,17 @@ MtChimney_EventScript_22EDD5:: @ 822EDD5 end MtChimney_EventScript_22EDF9:: @ 822EDF9 - msgbox MtChimney_Text_22FAD2, 4 + msgbox MtChimney_Text_22FAD2, MSGBOX_DEFAULT return MtChimney_EventScript_22EE02:: @ 822EE02 - msgbox MtChimney_Text_22FBC7, 4 + msgbox MtChimney_Text_22FBC7, MSGBOX_DEFAULT return MtChimney_EventScript_22EE0B:: @ 822EE0B lockall playbgm MUS_MGM0, 0 - msgbox MtChimney_Text_22F26A, 4 + msgbox MtChimney_Text_22F26A, MSGBOX_DEFAULT applymovement 2, MtChimney_Movement_27259E waitmovement 0 playse SE_PIN @@ -44,9 +44,9 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B waitmovement 0 applymovement 2, MtChimney_Movement_27259A waitmovement 0 - msgbox MtChimney_Text_22F32E, 4 - trainerbattle 3, TRAINER_MAXIE_2, 0, MtChimney_Text_22F5CF - msgbox MtChimney_Text_22F5F7, 4 + msgbox MtChimney_Text_22F32E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_22F5CF + msgbox MtChimney_Text_22F5F7, MSGBOX_DEFAULT closemessage delay 30 fadescreen 1 @@ -64,7 +64,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if 1, MtChimney_EventScript_22EED2 applymovement 255, MtChimney_Movement_2725A4 waitmovement 0 - msgbox MtChimney_Text_22FC3D, 4 + msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT closemessage compare VAR_FACING, 4 call_if 1, MtChimney_EventScript_22EEDD @@ -103,13 +103,13 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 lock faceplayer showmoneybox 0, 0, 0 - msgbox MtChimney_Text_22FE04, 5 + msgbox MtChimney_Text_22FE04, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF69 checkmoney 0xc8, 0 compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22EF76 - msgbox MtChimney_Text_22FE4D, 4 + msgbox MtChimney_Text_22FE4D, MSGBOX_DEFAULT checkitemspace ITEM_LAVA_COOKIE, 1 compare VAR_RESULT, 1 call_if 1, MtChimney_EventScript_22EF5E @@ -123,7 +123,7 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3 end MtChimney_EventScript_22EF51:: @ 822EF51 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -137,7 +137,7 @@ MtChimney_EventScript_22EF5E:: @ 822EF5E return MtChimney_EventScript_22EF69:: @ 822EF69 - msgbox MtChimney_Text_22FE9B, 4 + msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT hidemoneybox nop nop @@ -145,7 +145,7 @@ MtChimney_EventScript_22EF69:: @ 822EF69 end MtChimney_EventScript_22EF76:: @ 822EF76 - msgbox MtChimney_Text_22FE5E, 4 + msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT hidemoneybox nop nop @@ -399,57 +399,57 @@ MtChimney_Movement_22F04F: @ 822F04F step_end MtChimney_EventScript_22F053:: @ 822F053 - msgbox MtChimney_Text_22FD1F, 3 + msgbox MtChimney_Text_22FD1F, MSGBOX_SIGN end MtChimney_EventScript_22F05C:: @ 822F05C - msgbox MtChimney_Text_22FD5B, 3 + msgbox MtChimney_Text_22FD5B, MSGBOX_SIGN end MtChimney_EventScript_22F065:: @ 822F065 - msgbox MtChimney_Text_22FDA1, 3 + msgbox MtChimney_Text_22FDA1, MSGBOX_SIGN end MtChimney_EventScript_22F06E:: @ 822F06E - trainerbattle 0, TRAINER_TABITHA_2, 0, MtChimney_Text_22F6AA, MtChimney_Text_22F72C - msgbox MtChimney_Text_22F76D, 6 + trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_22F6AA, MtChimney_Text_22F72C + msgbox MtChimney_Text_22F76D, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F085:: @ 822F085 - trainerbattle 0, TRAINER_GRUNT_31, 0, MtChimney_Text_22F7A2, MtChimney_Text_22F83A - msgbox MtChimney_Text_22F859, 6 + trainerbattle_single TRAINER_GRUNT_31, MtChimney_Text_22F7A2, MtChimney_Text_22F83A + msgbox MtChimney_Text_22F859, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F09C:: @ 822F09C - msgbox MtChimney_Text_22F978, 3 + msgbox MtChimney_Text_22F978, MSGBOX_SIGN end MtChimney_EventScript_22F0A5:: @ 822F0A5 - msgbox MtChimney_Text_22F9B2, 3 + msgbox MtChimney_Text_22F9B2, MSGBOX_SIGN end MtChimney_EventScript_22F0AE:: @ 822F0AE - msgbox MtChimney_Text_22F9D1, 3 + msgbox MtChimney_Text_22F9D1, MSGBOX_SIGN end MtChimney_EventScript_22F0B7:: @ 822F0B7 - msgbox MtChimney_Text_22FA2F, 3 + msgbox MtChimney_Text_22FA2F, MSGBOX_SIGN end MtChimney_EventScript_22F0C0:: @ 822F0C0 - msgbox MtChimney_Text_22FA8B, 3 + msgbox MtChimney_Text_22FA8B, MSGBOX_SIGN end MtChimney_EventScript_22F0C9:: @ 822F0C9 - msgbox MtChimney_Text_22FAA5, 3 + msgbox MtChimney_Text_22FAA5, MSGBOX_SIGN end MtChimney_EventScript_22F0D2:: @ 822F0D2 - msgbox MtChimney_Text_22FACB, 3 + msgbox MtChimney_Text_22FACB, MSGBOX_SIGN end MtChimney_EventScript_22F0DB:: @ 822F0DB - msgbox MtChimney_Text_22FDFC, 3 + msgbox MtChimney_Text_22FDFC, MSGBOX_SIGN end MtChimney_EventScript_22F0E4:: @ 822F0E4 @@ -458,108 +458,102 @@ MtChimney_EventScript_22F0E4:: @ 822F0E4 goto_if 0, MtChimney_EventScript_22F137 checkflag FLAG_0x073 goto_eq MtChimney_EventScript_22F12D - msgbox MtChimney_Text_22FF12, 5 + msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq MtChimney_EventScript_22F123 - msgbox MtChimney_Text_22FF66, 4 + msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE setflag FLAG_0x073 releaseall end MtChimney_EventScript_22F123:: @ 822F123 - msgbox MtChimney_Text_22FF9C, 4 + msgbox MtChimney_Text_22FF9C, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F12D:: @ 822F12D - msgbox MtChimney_Text_22FFC0, 4 + msgbox MtChimney_Text_22FFC0, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F137:: @ 822F137 - msgbox MtChimney_Text_22FEAA, 4 + msgbox MtChimney_Text_22FEAA, MSGBOX_DEFAULT releaseall end MtChimney_EventScript_22F141:: @ 822F141 - msgbox MtChimney_Text_22FFFA, 3 + msgbox MtChimney_Text_22FFFA, MSGBOX_SIGN end MtChimney_EventScript_22F14A:: @ 822F14A - trainerbattle 2, TRAINER_SHELBY_1, 0, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 + trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_23001D, MtChimney_Text_230076, MtChimney_EventScript_22F176 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F195 - msgbox MtChimney_Text_2300A2, 4 + msgbox MtChimney_Text_2300A2, MSGBOX_DEFAULT release end MtChimney_EventScript_22F176:: @ 822F176 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_2300E3, 4 - setvar VAR_0x8004, 313 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 313 - callstd 8 + msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT + register_matchcall TRAINER_SHELBY_1 release end MtChimney_EventScript_22F195:: @ 822F195 - trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_230153, MtChimney_Text_2301BB - msgbox MtChimney_Text_2301E7, 6 + trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_230153, MtChimney_Text_2301BB + msgbox MtChimney_Text_2301E7, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1AC:: @ 822F1AC - trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_23022A, MtChimney_Text_23026D - msgbox MtChimney_Text_230292, 6 + trainerbattle_single TRAINER_MELISSA, MtChimney_Text_23022A, MtChimney_Text_23026D + msgbox MtChimney_Text_230292, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1C3:: @ 822F1C3 - trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_2302BD, MtChimney_Text_230304 - msgbox MtChimney_Text_23033A, 6 + trainerbattle_single TRAINER_SHEILA, MtChimney_Text_2302BD, MtChimney_Text_230304 + msgbox MtChimney_Text_23033A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1DA:: @ 822F1DA - trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_2303DF, MtChimney_Text_230436 - msgbox MtChimney_Text_230463, 6 + trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_2303DF, MtChimney_Text_230436 + msgbox MtChimney_Text_230463, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F1F1:: @ 822F1F1 - trainerbattle 0, TRAINER_GRUNT_24, 0, MtChimney_Text_22F8B6, MtChimney_Text_22F921 - msgbox MtChimney_Text_22F93A, 6 + trainerbattle_single TRAINER_GRUNT_24, MtChimney_Text_22F8B6, MtChimney_Text_22F921 + msgbox MtChimney_Text_22F93A, MSGBOX_AUTOCLOSE end MtChimney_EventScript_22F208:: @ 822F208 - trainerbattle 2, TRAINER_SAWYER_1, 0, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 + trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_2304B3, MtChimney_Text_2304F7, MtChimney_EventScript_22F234 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtChimney_EventScript_22F253 - msgbox MtChimney_Text_230519, 4 + msgbox MtChimney_Text_230519, MSGBOX_DEFAULT release end MtChimney_EventScript_22F234:: @ 822F234 special sub_80B4808 waitmovement 0 - msgbox MtChimney_Text_230557, 4 - setvar VAR_0x8004, 1 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 1 - callstd 8 + msgbox MtChimney_Text_230557, MSGBOX_DEFAULT + register_matchcall TRAINER_SAWYER_1 release end MtChimney_EventScript_22F253:: @ 822F253 - trainerbattle 5, TRAINER_SAWYER_1, 0, MtChimney_Text_23059C, MtChimney_Text_2305E3 - msgbox MtChimney_Text_230614, 6 + trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_23059C, MtChimney_Text_2305E3 + msgbox MtChimney_Text_230614, MSGBOX_AUTOCLOSE end MtChimney_Text_22F26A: @ 822F26A .string "The power contained in the METEORITE…\p" .string "By amplifying its power with this\n" - .string "machine, MT. CHIMNEY’s volcanic\l" + .string "machine, MT. CHIMNEY's volcanic\l" .string "activity will instantly intensify…\p" .string "Its energy will grow deep inside\n" .string "the crater and…\l" @@ -570,11 +564,11 @@ MtChimney_Text_22F32E: @ 822F32E .string "Who are you?\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "I’d heard ARCHIE bemoaning a child\n" - .string "who’s been meddling in TEAM AQUA’s\l" + .string "I'd heard ARCHIE bemoaning a child\n" + .string "who's been meddling in TEAM AQUA's\l" .string "affairs.\p" .string "It must be you he meant.\p" - .string "Humph! So you’re thinking of\n" + .string "Humph! So you're thinking of\n" .string "interfering with us, TEAM MAGMA?\p" .string "Now you listen.\n" .string "Long ago, living things used the\l" @@ -590,7 +584,7 @@ MtChimney_Text_22F32E: @ 822F32E .string "Oh! There was no need for you to\n" .string "learn that much.\p" .string "But, no matter!\n" - .string "I’ll teach you the consequences of\l" + .string "I'll teach you the consequences of\l" .string "meddling in our grand design!$" MtChimney_Text_22F5CF: @ 822F5CF @@ -600,35 +594,35 @@ MtChimney_Text_22F5CF: @ 822F5CF MtChimney_Text_22F5F7: @ 822F5F7 .string "MAXIE: But, enough.\n" .string "I will back off this time.\p" - .string "But don’t think that this is the last\n" - .string "you’ve seen of TEAM MAGMA.\p" + .string "But don't think that this is the last\n" + .string "you've seen of TEAM MAGMA.\p" .string "Fufufu…\p" .string "Even without the METEORITE, if we\n" .string "obtain that ORB… Fufufu…$" MtChimney_Text_22F6AA: @ 822F6AA .string "Hehehe!\p" - .string "So you’ve come all the way here!\p" - .string "But you’re too late!\n" - .string "I’ve already delivered the METEORITE\l" + .string "So you've come all the way here!\p" + .string "But you're too late!\n" + .string "I've already delivered the METEORITE\l" .string "from METEOR FALLS to the BOSS!$" MtChimney_Text_22F72C: @ 822F72C .string "Hehehe…\p" - .string "Even though I’ve lost, if our leader\n" + .string "Even though I've lost, if our leader\n" .string "awakens that thing…$" MtChimney_Text_22F76D: @ 822F76D .string "BOSS, hurry!\n" - .string "Give it the METEORITE’s energy!\p" + .string "Give it the METEORITE's energy!\p" .string "Hehehe…$" MtChimney_Text_22F7A2: @ 822F7A2 .string "We of TEAM MAGMA are working hard for\n" - .string "everyone’s sake.\p" - .string "Like, if that thing’s power made more\n" - .string "land, there’d be more places to live.\p" - .string "Everyone’d be happy!$" + .string "everyone's sake.\p" + .string "Like, if that thing's power made more\n" + .string "land, there'd be more places to live.\p" + .string "Everyone'd be happy!$" MtChimney_Text_22F83A: @ 822F83A .string "Hunh?\n" @@ -641,9 +635,9 @@ MtChimney_Text_22F859: @ 822F859 .string "in our way?$" MtChimney_Text_22F8B6: @ 822F8B6 - .string "If there were more land, I’d be able\n" + .string "If there were more land, I'd be able\n" .string "to get a big house of my own!\p" - .string "I’m going to build it on hardened lava!$" + .string "I'm going to build it on hardened lava!$" MtChimney_Text_22F921: @ 822F921 .string "My dream of a big house…$" @@ -660,14 +654,14 @@ MtChimney_Text_22F9B2: @ 822F9B2 .string "METEORITES pack amazing power!$" MtChimney_Text_22F9D1: @ 822F9D1 - .string "You’d better not mess with us!\p" - .string "We’re trying to awaken that thing\n" + .string "You'd better not mess with us!\p" + .string "We're trying to awaken that thing\n" .string "for the benefit of everyone!$" MtChimney_Text_22FA2F: @ 822FA2F - .string "We’re TEAM MAGMA!\p" - .string "They’re TEAM AQUA!\p" - .string "It totally annoys me that they’d\n" + .string "We're TEAM MAGMA!\p" + .string "They're TEAM AQUA!\p" + .string "It totally annoys me that they'd\n" .string "use a name like ours!$" MtChimney_Text_22FA8B: @ 822FA8B @@ -675,25 +669,25 @@ MtChimney_Text_22FA8B: @ 822FA8B .string "Douse them in fire!$" MtChimney_Text_22FAA5: @ 822FAA5 - .string "We’re going to keep making more land!$" + .string "We're going to keep making more land!$" MtChimney_Text_22FACB: @ 822FACB .string "Bufoh!$" MtChimney_Text_22FAD2: @ 822FAD2 .string "ARCHIE: Grr, {PLAYER}!\n" - .string "I should’ve guessed you’d show up!\p" + .string "I should've guessed you'd show up!\p" .string "See for yourself what the fanatics\n" .string "of TEAM MAGMA are up to!\p" - .string "They’re trying to inject the stolen\n" - .string "METEORITE’s power into the volcano!\p" + .string "They're trying to inject the stolen\n" + .string "METEORITE's power into the volcano!\p" .string "Doing something like that will cause\n" - .string "the volcano’s eruption!$" + .string "the volcano's eruption!$" MtChimney_Text_22FBC7: @ 822FBC7 .string "ARCHIE: Grrr…\p" .string "I want to stop that MAXIE,\n" - .string "but I can’t!\p" + .string "but I can't!\p" .string "Not when I have my hands full battling\n" .string "three opponents at once!$" @@ -701,42 +695,42 @@ MtChimney_Text_22FC3D: @ 822FC3D .string "ARCHIE: {PLAYER}!\n" .string "Thank you!\p" .string "With your help, we thwarted TEAM\n" - .string "MAGMA’s destructive plan!\p" + .string "MAGMA's destructive plan!\p" .string "But… You…\n" .string "Whose side are you on?\p" - .string "Ah, it doesn’t matter.\p" + .string "Ah, it doesn't matter.\p" .string "We will remain vigilant and keep up\n" .string "our pursuit of TEAM MAGMA.\p" .string "{PLAYER}, we shall meet again!$" MtChimney_Text_22FD1F: @ 822FD1F .string "Darn… TEAM MAGMA outnumbers us!\n" - .string "We can’t keep up with them!$" + .string "We can't keep up with them!$" MtChimney_Text_22FD5B: @ 822FD5B - .string "If they expand the land, there’ll be\n" + .string "If they expand the land, there'll be\n" .string "less habitats for WATER POKéMON!$" MtChimney_Text_22FDA1: @ 822FDA1 - .string "We’re TEAM AQUA!\p" - .string "They’re TEAM MAGMA!\p" - .string "It burns me up that they’d use such\n" + .string "We're TEAM AQUA!\p" + .string "They're TEAM MAGMA!\p" + .string "It burns me up that they'd use such\n" .string "a confusing name!$" MtChimney_Text_22FDFC: @ 822FDFC .string "Bushaa!$" MtChimney_Text_22FE04: @ 822FE04 - .string "LAVA COOKIES are MT. CHIMNEY’s local\n" + .string "LAVA COOKIES are MT. CHIMNEY's local\n" .string "specialty.\p" - .string "Try one. It’s just ¥200.$" + .string "Try one. It's just ¥200.$" MtChimney_Text_22FE4D: @ 822FE4D .string "Thank you, dear!$" MtChimney_Text_22FE5E: @ 822FE5E - .string "Oh, dear. You can’t buy a thing if\n" - .string "you’ve not got the money.$" + .string "Oh, dear. You can't buy a thing if\n" + .string "you've not got the money.$" MtChimney_Text_22FE9B: @ 822FE9B .string "Oh, fine then.$" @@ -769,16 +763,16 @@ MtChimney_Text_22FFFA: @ 822FFFA .string "LAVARIDGE TOWN AHEAD$" MtChimney_Text_23001D: @ 823001D - .string "I’ve been to the hot springs and\n" + .string "I've been to the hot springs and\n" .string "refreshed my tired bones.\l" - .string "Right now I’m feeling strong!$" + .string "Right now I'm feeling strong!$" MtChimney_Text_230076: @ 8230076 .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Now, aren't you something!$" MtChimney_Text_2300A2: @ 82300A2 - .string "Well, well, I’ve lost. I can’t call\n" + .string "Well, well, I've lost. I can't call\n" .string "myself an EXPERT now, can I?$" MtChimney_Text_2300E3: @ 82300E3 @@ -794,15 +788,15 @@ MtChimney_Text_230153: @ 8230153 MtChimney_Text_2301BB: @ 82301BB .string "Oh, my goodness.\n" - .string "Now, aren’t you something!$" + .string "Now, aren't you something!$" MtChimney_Text_2301E7: @ 82301E7 .string "Perhaps your heart has become one\n" .string "with the hearts of your POKéMON.$" MtChimney_Text_23022A: @ 823022A - .string "I’ve got the fire in me, baby.\n" - .string "I can’t stand it! I have to battle!$" + .string "I've got the fire in me, baby.\n" + .string "I can't stand it! I have to battle!$" MtChimney_Text_23026D: @ 823026D .string "Ooh, that was a scorching-hot match!$" @@ -812,15 +806,15 @@ MtChimney_Text_230292: @ 8230292 .string "me up, baby!$" MtChimney_Text_2302BD: @ 82302BD - .string "I’ve finally made it to MT. CHIMNEY.\n" + .string "I've finally made it to MT. CHIMNEY.\n" .string "I want to make my POKéMON battle!$" MtChimney_Text_230304: @ 8230304 .string "The way you battle…\n" - .string "It’s like a MT. CHIMNEY eruption!$" + .string "It's like a MT. CHIMNEY eruption!$" MtChimney_Text_23033A: @ 823033A - .string "Like I said, I’ve finally made it to\n" + .string "Like I said, I've finally made it to\n" .string "MT. CHIMNEY. It would be a shame if\l" .string "I only do a little sightseeing…\p" .string "I want to get in some battles and buy\n" @@ -828,15 +822,15 @@ MtChimney_Text_23033A: @ 823033A MtChimney_Text_2303DF: @ 82303DF .string "Since I bathed in the hot springs,\n" - .string "I’ve been feeling great!\l" - .string "I’m sure I’m going to win!$" + .string "I've been feeling great!\l" + .string "I'm sure I'm going to win!$" MtChimney_Text_230436: @ 8230436 .string "Yowch!\n" - .string "I’m getting a chill out of the water.$" + .string "I'm getting a chill out of the water.$" MtChimney_Text_230463: @ 8230463 - .string "I’ll have to take another dip in the\n" + .string "I'll have to take another dip in the\n" .string "hot springs. Want to join me?\p" .string "Just joking!$" @@ -845,7 +839,7 @@ MtChimney_Text_2304B3: @ 82304B3 .string "hot people around for company!$" MtChimney_Text_2304F7: @ 82304F7 - .string "Oh, you’re a real firebrand, too!$" + .string "Oh, you're a real firebrand, too!$" MtChimney_Text_230519: @ 8230519 .string "I think I need a dip in LAVARIDGE\n" @@ -856,14 +850,14 @@ MtChimney_Text_230557: @ 8230557 .string "Let me register you in my POKéNAV.$" MtChimney_Text_23059C: @ 823059C - .string "I’m happily surrounded by hot people\n" - .string "around these parts. I won’t lose!$" + .string "I'm happily surrounded by hot people\n" + .string "around these parts. I won't lose!$" MtChimney_Text_2305E3: @ 82305E3 - .string "Gosh, you’re still the same\n" + .string "Gosh, you're still the same\n" .string "firebrand as before!$" MtChimney_Text_230614: @ 8230614 .string "Actually, it really is hot here.\n" - .string "I’m overdressed for these parts.$" + .string "I'm overdressed for these parts.$" diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index b6c2118db..89fc9fd38 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -31,7 +31,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B lock faceplayer - msgbox MtChimney_CableCarStation_Text_22ACB9, 5 + msgbox MtChimney_CableCarStation_Text_22ACB9, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq MtChimney_CableCarStation_EventScript_22AC6C compare VAR_RESULT, 0 @@ -39,7 +39,7 @@ MtChimney_CableCarStation_EventScript_22AC4B:: @ 822AC4B end MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C - msgbox MtChimney_CableCarStation_Text_22ACF8, 4 + msgbox MtChimney_CableCarStation_Text_22ACF8, MSGBOX_DEFAULT closemessage applymovement 1, MtChimney_CableCarStation_Movement_22ACA5 applymovement 255, MtChimney_CableCarStation_Movement_22ACAF @@ -48,13 +48,13 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C setvar VAR_0x40A3, 2 incrementgamestat 48 special CableCarWarp - special sub_814FC9C + special CableCar waitstate release end MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B - msgbox MtChimney_CableCarStation_Text_22AD0E, 4 + msgbox MtChimney_CableCarStation_Text_22AD0E, MSGBOX_DEFAULT release end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index 51c8a88fb..c5f24ccc0 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -6,7 +6,7 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F faceplayer checkflag FLAG_0x11A goto_eq MtPyre_1F_EventScript_230F6E - msgbox MtPyre_1F_Text_230F8A, 4 + msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 goto_eq MtPyre_1F_EventScript_272054 @@ -15,23 +15,23 @@ MtPyre_1F_EventScript_230F3F:: @ 8230F3F end MtPyre_1F_EventScript_230F6E:: @ 8230F6E - msgbox MtPyre_1F_Text_231005, 4 + msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT release end MtPyre_1F_EventScript_230F78:: @ 8230F78 - msgbox MtPyre_1F_Text_23104F, 2 + msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC end MtPyre_1F_EventScript_230F81:: @ 8230F81 - msgbox MtPyre_1F_Text_2310BA, 2 + msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC end MtPyre_1F_Text_230F8A: @ 8230F8A .string "All sorts of beings wander the slopes\n" .string "of MT. PYRE…\p" .string "There is no telling what may happen.\n" - .string "Take this. It’s for your own good.$" + .string "Take this. It's for your own good.$" MtPyre_1F_Text_231005: @ 8231005 .string "Have a POKéMON hold that\n" diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index de8520954..cdf2cb98b 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -10,36 +10,36 @@ MtPyre_2F_MapScript1_23110B: @ 823110B end MtPyre_2F_EventScript_231116:: @ 8231116 - msgbox MtPyre_2F_Text_2311A3, 2 + msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC end MtPyre_2F_EventScript_23111F:: @ 823111F - msgbox MtPyre_2F_Text_2311E6, 2 + msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC end MtPyre_2F_EventScript_231128:: @ 8231128 - trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 - msgbox MtPyre_2F_Text_2312CB, 6 + trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2 + msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23113F:: @ 823113F - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 - msgbox MtPyre_2F_Text_2313B1, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414 + msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23115A:: @ 823115A - trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 - msgbox MtPyre_2F_Text_23154D, 6 + trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582 + msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_231175:: @ 8231175 - trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 - msgbox MtPyre_2F_Text_23165A, 6 + trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645 + msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE end MtPyre_2F_EventScript_23118C:: @ 823118C - trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 - msgbox MtPyre_2F_Text_2316FB, 6 + trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1 + msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE end MtPyre_2F_Text_2311A3: @ 82311A3 @@ -49,62 +49,62 @@ MtPyre_2F_Text_2311A3: @ 82311A3 MtPyre_2F_Text_2311E6: @ 82311E6 .string "Ooch, ouch… There are holes in the\n" .string "ground here and there.\p" - .string "I didn’t notice and took a tumble from\n" + .string "I didn't notice and took a tumble from\n" .string "the floor above.$" MtPyre_2F_Text_231258: @ 8231258 .string "Hey! Are you searching for POKéMON?\n" - .string "You came along after me! You’re rude!$" + .string "You came along after me! You're rude!$" MtPyre_2F_Text_2312A2: @ 82312A2 .string "Ayieeeeh!\n" - .string "I’m sorry, forgive me, please!$" + .string "I'm sorry, forgive me, please!$" MtPyre_2F_Text_2312CB: @ 82312CB - .string "People don’t come here often, so\n" - .string "I thought there’d be rare POKéMON.$" + .string "People don't come here often, so\n" + .string "I thought there'd be rare POKéMON.$" MtPyre_2F_Text_23130F: @ 823130F - .string "LUKE: We’re here on a dare.\p" + .string "LUKE: We're here on a dare.\p" .string "Heheh, if I show her how cool I am,\n" - .string "she’ll fall for me. I know it!\p" - .string "I know! I’ll cream you and show her\n" + .string "she'll fall for me. I know it!\p" + .string "I know! I'll cream you and show her\n" .string "how cool I am!$" MtPyre_2F_Text_2313A1: @ 82313A1 .string "LUKE: Whoopsie!$" MtPyre_2F_Text_2313B1: @ 82313B1 - .string "LUKE: Well, we lost but that’s okay!\n" - .string "I’m right here by your side.\l" - .string "We’ll make it through this dare!$" + .string "LUKE: Well, we lost but that's okay!\n" + .string "I'm right here by your side.\l" + .string "We'll make it through this dare!$" MtPyre_2F_Text_231414: @ 8231414 .string "LUKE: If you want to take me on,\n" .string "bring some more POKéMON.\p" - .string "If you don’t, I won’t be able to show\n" + .string "If you don't, I won't be able to show\n" .string "off to my girl how cool I am!$" MtPyre_2F_Text_231492: @ 8231492 .string "DEZ: I came here on a dare with my\n" .string "boyfriend.\p" - .string "It’s really scary, but I’m with my\n" - .string "boyfriend. It’s okay.\p" - .string "I know! I’ll get my boyfriend to look\n" + .string "It's really scary, but I'm with my\n" + .string "boyfriend. It's okay.\p" + .string "I know! I'll get my boyfriend to look\n" .string "cool by beating you!$" MtPyre_2F_Text_231534: @ 8231534 - .string "DEZ: Waaaah! I’m scared!$" + .string "DEZ: Waaaah! I'm scared!$" MtPyre_2F_Text_23154D: @ 823154D - .string "DEZ: We’re lovey-dovey, so we don’t\n" + .string "DEZ: We're lovey-dovey, so we don't\n" .string "care if we lose!$" MtPyre_2F_Text_231582: @ 8231582 .string "DEZ: If you want to challenge us, you\n" .string "should bring at least two POKéMON.\p" - .string "My boyfriend’s strong.\n" - .string "Just one POKéMON won’t do at all.$" + .string "My boyfriend's strong.\n" + .string "Just one POKéMON won't do at all.$" MtPyre_2F_Text_231604: @ 8231604 .string "You are an unfamiliar sight…\n" @@ -112,17 +112,17 @@ MtPyre_2F_Text_231604: @ 8231604 MtPyre_2F_Text_231645: @ 8231645 .string "Hmm…\n" - .string "You’re durable.$" + .string "You're durable.$" MtPyre_2F_Text_23165A: @ 823165A .string "Our family has been TRAINERS here\n" - .string "since my great-grandmother’s time…\p" + .string "since my great-grandmother's time…\p" .string "It is my duty to protect this\n" .string "mountain…$" MtPyre_2F_Text_2316C7: @ 82316C7 .string "Kiyaaaaah!\n" - .string "I’m terrified!$" + .string "I'm terrified!$" MtPyre_2F_Text_2316E1: @ 82316E1 .string "Nooooooo!\n" @@ -131,5 +131,5 @@ MtPyre_2F_Text_2316E1: @ 82316E1 MtPyre_2F_Text_2316FB: @ 82316FB .string "I get freaked out every time I see\n" .string "anything move…\p" - .string "I shouldn’t have come here to train…$" + .string "I shouldn't have come here to train…$" diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ec5373509..42c39705c 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,38 +2,35 @@ MtPyre_3F_MapScripts:: @ 8231752 .byte 0 MtPyre_3F_EventScript_231753:: @ 8231753 - trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 - msgbox MtPyre_3F_Text_231869, 6 + trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853 + msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_23176A:: @ 823176A - trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD - msgbox MtPyre_3F_Text_2318F2, 6 + trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD + msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE end MtPyre_3F_EventScript_231781:: @ 8231781 - trainerbattle 2, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD + trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_3F_EventScript_2317CC - msgbox MtPyre_3F_Text_23199B, 4 + msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT release end MtPyre_3F_EventScript_2317AD:: @ 82317AD special sub_80B4808 waitmovement 0 - msgbox MtPyre_3F_Text_231A49, 4 - setvar VAR_0x8004, 9 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 9 - callstd 8 + msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT + register_matchcall TRAINER_GABRIELLE_1 release end MtPyre_3F_EventScript_2317CC:: @ 82317CC - trainerbattle 5, TRAINER_GABRIELLE_1, 0, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 - msgbox MtPyre_3F_Text_231B0D, 6 + trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6 + msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE end MtPyre_3F_Text_2317E3: @ 82317E3 @@ -60,7 +57,7 @@ MtPyre_3F_Text_2318DD: @ 82318DD MtPyre_3F_Text_2318F2: @ 82318F2 .string "This means my training is still not\n" .string "enough…\p" - .string "I’ve got to keep working toward the\n" + .string "I've got to keep working toward the\n" .string "summit…\p" .string "Go, me!$" @@ -69,7 +66,7 @@ MtPyre_3F_Text_231952: @ 8231952 MtPyre_3F_Text_23196A: @ 823196A .string "That was amazing!\n" - .string "You’re a very special TRAINER.$" + .string "You're a very special TRAINER.$" MtPyre_3F_Text_23199B: @ 823199B .string "POKéMON no longer of this world.\n" @@ -85,7 +82,7 @@ MtPyre_3F_Text_231A49: @ 8231A49 .string "Please, I need to see your POKéNAV.$" MtPyre_3F_Text_231AAB: @ 8231AAB - .string "Oh, it’s you…\p" + .string "Oh, it's you…\p" .string "Have you come to show me your grown\n" .string "POKéMON?$" @@ -99,5 +96,5 @@ MtPyre_3F_Text_231B0D: @ 8231B0D .string "And the POKéMON that you will meet\n" .string "in the future…\p" .string "They are all to be equally cherished.\n" - .string "I see that you’ve remembered that.$" + .string "I see that you've remembered that.$" diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 0573e0f11..27883c8ed 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,8 +2,8 @@ MtPyre_4F_MapScripts:: @ 8231BC8 .byte 0 MtPyre_5F_EventScript_231BC9:: @ 8231BC9 - trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 - msgbox MtPyre_5F_Text_231C24, 6 + trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08 + msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE end MtPyre_5F_Text_231BE0: @ 8231BE0 diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 4678ac7e0..cbd3b3afa 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,14 +2,14 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, 6 + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end MtPyre_4F_Text_231C85: @ 8231C85 .string "I love all things horrifying…\n" - .string "It’s like a disease…\p" - .string "When I’m here…\n" + .string "It's like a disease…\p" + .string "When I'm here…\n" .string "I shiver with fear…$" MtPyre_4F_Text_231CDB: @ 8231CDB @@ -17,7 +17,7 @@ MtPyre_4F_Text_231CDB: @ 8231CDB MtPyre_4F_Text_231CEE: @ 8231CEE .string "I want to see dreadful things…\n" - .string "I can’t leave…\p" + .string "I can't leave…\p" .string "Stay…\n" - .string "Won’t you stay with me?$" + .string "Won't you stay with me?$" diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 8d5d912c2..92178b21b 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,37 +2,34 @@ MtPyre_6F_MapScripts:: @ 8231D3A .byte 0 MtPyre_6F_EventScript_231D3B:: @ 8231D3B - trainerbattle 2, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 + trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq MtPyre_6F_EventScript_231D86 - msgbox MtPyre_6F_Text_231DFC, 4 + msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT release end MtPyre_6F_EventScript_231D67:: @ 8231D67 special sub_80B4808 waitmovement 0 - msgbox MtPyre_6F_Text_231E43, 4 - setvar VAR_0x8004, 108 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 108 - callstd 8 + msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT + register_matchcall TRAINER_VALERIE_1 release end MtPyre_6F_EventScript_231D86:: @ 8231D86 - trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB - msgbox MtPyre_6F_Text_231EE1, 6 + trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB + msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE end MtPyre_6F_EventScript_231D9D:: @ 8231D9D - trainerbattle 0, TRAINER_CEDRIC, 0, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A - msgbox MtPyre_6F_Text_231F5C, 6 + trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A + msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE end MtPyre_6F_Text_231DB4: @ 8231DB4 - .string "When I’m here…\n" + .string "When I'm here…\n" .string "A curious power flows into me…$" MtPyre_6F_Text_231DE2: @ 8231DE2 @@ -64,10 +61,10 @@ MtPyre_6F_Text_231F11: @ 8231F11 .string "Have no fear for I am here!$" MtPyre_6F_Text_231F4A: @ 8231F4A - .string "Weren’t you lost?$" + .string "Weren't you lost?$" MtPyre_6F_Text_231F5C: @ 8231F5C .string "I had this feeling that a lost TRAINER\n" .string "would be panicked and easy to beat.\p" - .string "It’s dirty and I won’t try it again…$" + .string "It's dirty and I won't try it again…$" diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 352d92d83..13caaab1e 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -43,7 +43,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_2320EB compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_2320EC - msgbox MtPyre_Summit_Text_23281A, 4 + msgbox MtPyre_Summit_Text_23281A, MSGBOX_DEFAULT closemessage fadescreen 1 removeobject 2 @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if 1, MtPyre_Summit_EventScript_23210C compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232117 - msgbox MtPyre_Summit_Text_23290E, 4 + msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM setflag FLAG_0x0D4 setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD @@ -133,7 +133,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C faceplayer checkflag FLAG_0x09E goto_eq MtPyre_Summit_EventScript_232167 - msgbox MtPyre_Summit_Text_232E0C, 5 + msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232187 compare VAR_RESULT, 0 @@ -142,7 +142,7 @@ MtPyre_Summit_EventScript_23213C:: @ 823213C end MtPyre_Summit_EventScript_232167:: @ 8232167 - msgbox MtPyre_Summit_Text_2331A6, 5 + msgbox MtPyre_Summit_Text_2331A6, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, MtPyre_Summit_EventScript_232199 compare VAR_RESULT, 0 @@ -151,15 +151,15 @@ MtPyre_Summit_EventScript_232167:: @ 8232167 end MtPyre_Summit_EventScript_232187:: @ 8232187 - msgbox MtPyre_Summit_Text_232F27, 4 + msgbox MtPyre_Summit_Text_232F27, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232190:: @ 8232190 - msgbox MtPyre_Summit_Text_233162, 4 + msgbox MtPyre_Summit_Text_233162, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_232199:: @ 8232199 - msgbox MtPyre_Summit_Text_23325D, 4 + msgbox MtPyre_Summit_Text_23325D, MSGBOX_DEFAULT return MtPyre_Summit_EventScript_2321A2:: @ 82321A2 @@ -171,23 +171,23 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2 call_if 4, MtPyre_Summit_EventScript_2321CB checkflag FLAG_0x081 goto_eq MtPyre_Summit_EventScript_2321D8 - msgbox MtPyre_Summit_Text_232AD8, 4 + msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321CB:: @ 82321CB - msgbox MtPyre_Summit_Text_232CA6, 4 + msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT setflag FLAG_0x103 release end MtPyre_Summit_EventScript_2321D8:: @ 82321D8 - msgbox MtPyre_Summit_Text_232B4F, 4 + msgbox MtPyre_Summit_Text_232B4F, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321E2:: @ 82321E2 - msgbox MtPyre_Summit_Text_232D1E, 4 + msgbox MtPyre_Summit_Text_232D1E, MSGBOX_DEFAULT release end @@ -231,7 +231,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210 call_if 1, MtPyre_Summit_EventScript_232328 compare VAR_0x8008, 2 call_if 1, MtPyre_Summit_EventScript_232341 - msgbox MtPyre_Summit_Text_233183, 4 + msgbox MtPyre_Summit_Text_233183, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, MtPyre_Summit_EventScript_23235A @@ -425,29 +425,29 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8 step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD - trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 - msgbox MtPyre_Summit_Text_2324E0, 6 + trainerbattle_single TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0 + msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232414:: @ 8232414 - trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 - msgbox MtPyre_Summit_Text_2325E4, 6 + trainerbattle_single TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0 + msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_23242B:: @ 823242B - trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 - msgbox MtPyre_Summit_Text_2326B3, 6 + trainerbattle_single TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678 + msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE end MtPyre_Summit_EventScript_232442:: @ 8232442 - trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A - msgbox MtPyre_Summit_Text_2327D8, 6 + trainerbattle_single TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A + msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE end MtPyre_Summit_Text_232459: @ 8232459 .string "No! Those TEAM MAGMA goons got\n" .string "here ahead of us!\p" - .string "We can’t fall behind!$" + .string "We can't fall behind!$" MtPyre_Summit_Text_2324A0: @ 82324A0 .string "I thought you were one of the MAGMAS\n" @@ -455,36 +455,36 @@ MtPyre_Summit_Text_2324A0: @ 82324A0 MtPyre_Summit_Text_2324E0: @ 82324E0 .string "Yeah, so you are strong…\n" - .string "But there’re a lot of us!$" + .string "But there're a lot of us!$" MtPyre_Summit_Text_232513: @ 8232513 .string "Hah!\n" .string "Too bad for you!\p" - .string "If you came earlier, you only would’ve\n" + .string "If you came earlier, you only would've\n" .string "had to battle the wimpy TEAM MAGMA.\p" .string "But since you arrived now, you have\n" .string "to take on us toughies!$" MtPyre_Summit_Text_2325B0: @ 82325B0 - .string "Urgh… I should’ve let you take on\n" + .string "Urgh… I should've let you take on\n" .string "TEAM MAGMA first…$" MtPyre_Summit_Text_2325E4: @ 82325E4 - .string "You don’t know anything!\n" + .string "You don't know anything!\n" .string "So why are you messing with us?$" MtPyre_Summit_Text_23261D: @ 823261D .string "You…\n" .string "We saw you at MT. CHIMNEY.\p" - .string "You don’t belong to either TEAM,\n" + .string "You don't belong to either TEAM,\n" .string "so why would you be here?$" MtPyre_Summit_Text_232678: @ 8232678 - .string "If you’re going to mess with anyone,\n" + .string "If you're going to mess with anyone,\n" .string "let it be TEAM MAGMA…$" MtPyre_Summit_Text_2326B3: @ 82326B3 - .string "Heh, it doesn’t matter!\n" + .string "Heh, it doesn't matter!\n" .string "We bought ourselves some time!\p" .string "The BOSS should have snatched what\n" .string "he was after!$" @@ -492,8 +492,8 @@ MtPyre_Summit_Text_2326B3: @ 82326B3 MtPyre_Summit_Text_23271B: @ 823271B .string "Oh, I know!\n" .string "You tried to join TEAM MAGMA,\l" - .string "but they wouldn’t have you!\p" - .string "Well, don’t think that we’ll let you\n" + .string "but they wouldn't have you!\p" + .string "Well, don't think that we'll let you\n" .string "join our TEAM AQUA!$" MtPyre_Summit_Text_23279A: @ 823279A @@ -505,14 +505,14 @@ MtPyre_Summit_Text_2327D8: @ 82327D8 .string "with us members and our leader.$" MtPyre_Summit_Text_23281A: @ 823281A - .string "ARCHIE: TEAM MAGMA’s MAXIE got ahead\n" + .string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n" .string "of us, but we also got what we wanted.\p" .string "The RED ORB preserved at MT. PYRE…\n" .string "I, ARCHIE, now have it in my possession!\p" .string "Fufufu… Now we can bring our ultimate\n" .string "objective to fruition!\p" .string "Okay, TEAM!\n" - .string "We’re pulling out!$" + .string "We're pulling out!$" MtPyre_Summit_Text_23290E: @ 823290E .string "Oh, no…\n" @@ -529,7 +529,7 @@ MtPyre_Summit_Text_23290E: @ 823290E .string "and took the BLUE ORB first?\p" .string "Well, in their haste, they left this\n" .string "behind.\p" - .string "I couldn’t imagine what exactly it\n" + .string "I couldn't imagine what exactly it\n" .string "could be.\p" .string "I would like you to have it.\n" .string "Perhaps it will be useful in some way.$" diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 7f5a9e4c7..910dc8eed 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -4,10 +4,10 @@ NavelRock_Harbor_MapScripts:: @ 82690BC NavelRock_Harbor_EventScript_2690BD:: @ 82690BD lock faceplayer - msgbox NavelRock_Harbor_Text_2C6CE6, 5 + msgbox NavelRock_Harbor_Text_2C6CE6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NavelRock_Harbor_EventScript_269102 - msgbox NavelRock_Harbor_Text_2A6A5D, 4 + msgbox NavelRock_Harbor_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, NavelRock_Harbor_Movement_2725AA waitmovement 0 @@ -21,7 +21,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD end NavelRock_Harbor_EventScript_269102:: @ 8269102 - msgbox NavelRock_Harbor_Text_2A6A82, 4 + msgbox NavelRock_Harbor_Text_2A6A82, MSGBOX_DEFAULT release end diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index 727b77985..714a20b6b 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -25,14 +25,14 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF lockall applymovement 255, NewMauville_Entrance_Movement_2725A6 waitmovement 0 - msgbox NewMauville_Entrance_Text_237382, 4 + msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT checkitem ITEM_BASEMENT_KEY, 1 compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_237396, 5 + msgbox NewMauville_Entrance_Text_237396, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq NewMauville_Entrance_EventScript_237380 - msgbox NewMauville_Entrance_Text_2373AC, 4 + msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT setmetatile 3, 0, 707, 0 setmetatile 4, 0, 708, 0 setmetatile 5, 0, 709, 0 diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 1ced90ca9..b0f0a18c7 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_2375D7:: @ 82375D7 NewMauville_Inside_EventScript_237725:: @ 8237725 lockall - msgbox NewMauville_Inside_Text_237932, 4 + msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT call NewMauville_Inside_EventScript_23773A setvar VAR_0x40BA, 2 releaseall @@ -173,12 +173,12 @@ NewMauville_Inside_EventScript_23778F:: @ 823778F lockall compare VAR_0x40BA, 2 goto_eq NewMauville_Inside_EventScript_2377A5 - msgbox NewMauville_Inside_Text_237896, 4 + msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT releaseall end NewMauville_Inside_EventScript_2377A5:: @ 82377A5 - msgbox NewMauville_Inside_Text_237916, 4 + msgbox NewMauville_Inside_Text_237916, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 174d108eb..d2e808116 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -28,11 +28,11 @@ OldaleTown_EventScript_1E8EDE:: @ 81E8EDE return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA - msgbox OldaleTown_Text_1E94DA, 3 + msgbox OldaleTown_Text_1E94DA, MSGBOX_SIGN end OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 - msgbox OldaleTown_Text_1E918E, 2 + msgbox OldaleTown_Text_1E918E, MSGBOX_NPC end OldaleTown_EventScript_1E8EFC:: @ 81E8EFC @@ -44,7 +44,7 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC goto_eq OldaleTown_EventScript_1E8FB9 setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 - msgbox OldaleTown_Text_1E91C0, 4 + msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, OldaleTown_EventScript_1E8F47 @@ -74,23 +74,23 @@ OldaleTown_EventScript_1E8F75:: @ 81E8F75 end OldaleTown_EventScript_1E8F8C:: @ 81E8F8C - msgbox OldaleTown_Text_1E91FD, 4 + msgbox OldaleTown_Text_1E91FD, MSGBOX_DEFAULT giveitem_std ITEM_POTION compare VAR_RESULT, 0 goto_eq OldaleTown_EventScript_1E8FC3 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT setflag FLAG_0x084 fadedefaultbgm release end OldaleTown_EventScript_1E8FB9:: @ 81E8FB9 - msgbox OldaleTown_Text_1E92AF, 4 + msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT release end OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT fadedefaultbgm release end @@ -197,7 +197,7 @@ OldaleTown_EventScript_1E901F:: @ 81E901F faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_EventScript_1E9066 - msgbox OldaleTown_Text_1E939A, 4 + msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 waitmovement 0 @@ -209,7 +209,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F applymovement 255, OldaleTown_Movement_1E9182 applymovement 3, OldaleTown_Movement_1E9185 waitmovement 0 - msgbox OldaleTown_Text_1E9313, 4 + msgbox OldaleTown_Text_1E9313, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_1E918B waitmovement 0 @@ -217,7 +217,7 @@ OldaleTown_EventScript_1E903F:: @ 81E903F end OldaleTown_EventScript_1E9066:: @ 81E9066 - msgbox OldaleTown_Text_1E93F8, 4 + msgbox OldaleTown_Text_1E93F8, MSGBOX_DEFAULT release end @@ -268,12 +268,12 @@ OldaleTown_EventScript_1E90E6:: @ 81E90E6 end OldaleTown_EventScript_1E90FE:: @ 81E90FE - msgbox OldaleTown_Text_1E9462, 4 + msgbox OldaleTown_Text_1E9462, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end OldaleTown_EventScript_1E910C:: @ 81E910C - msgbox OldaleTown_Text_1E948A, 4 + msgbox OldaleTown_Text_1E948A, MSGBOX_DEFAULT goto OldaleTown_EventScript_1E911A end @@ -351,7 +351,7 @@ OldaleTown_Movement_1E918B: @ 81E918B step_end OldaleTown_Text_1E918E: @ 81E918E - .string "I want to take a rest, so I’m saving my\n" + .string "I want to take a rest, so I'm saving my\n" .string "progress.$" OldaleTown_Text_1E91C0: @ 81E91C0 @@ -364,17 +364,17 @@ OldaleTown_Text_1E91FD: @ 81E91FD .string "Just look for our blue roof.\p" .string "We sell a variety of goods including\n" .string "POKé BALLS for catching POKéMON.\p" - .string "Here, I’d like you to have this as\n" + .string "Here, I'd like you to have this as\n" .string "a promotional item.$" OldaleTown_Text_1E92AF: @ 81E92AF - .string "A POTION can be used anytime, so it’s\n" + .string "A POTION can be used anytime, so it's\n" .string "even more useful than a POKéMON CENTER\l" .string "in certain situations.$" OldaleTown_Text_1E9313: @ 81E9313 .string "Aaaaah! Wait!\n" - .string "Please don’t come in here.\p" + .string "Please don't come in here.\p" .string "I just discovered the footprints of\n" .string "a rare POKéMON!\p" .string "Wait until I finish sketching\n" @@ -395,10 +395,10 @@ OldaleTown_Text_1E93F8: @ 81E93F8 OldaleTown_Text_1E9462: @ 81E9462 .string "MAY: {PLAYER}{KUN}!\n" .string "Over here!\l" - .string "Let’s hurry home!$" + .string "Let's hurry home!$" OldaleTown_Text_1E948A: @ 81E948A - .string "BRENDAN: I’m heading back to my dad’s\n" + .string "BRENDAN: I'm heading back to my dad's\n" .string "LAB now.\l" .string "{PLAYER}, you should hustle back, too.$" diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc index 6a36ff57e..71010116e 100644 --- a/data/maps/OldaleTown_House1/scripts.inc +++ b/data/maps/OldaleTown_House1/scripts.inc @@ -2,7 +2,7 @@ OldaleTown_House1_MapScripts:: @ 81FBE85 .byte 0 OldaleTown_House1_EventScript_1FBE86:: @ 81FBE86 - msgbox OldaleTown_House1_Text_1FBE8F, 2 + msgbox OldaleTown_House1_Text_1FBE8F, MSGBOX_NPC end OldaleTown_House1_Text_1FBE8F: @ 81FBE8F diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc index 55941705c..74a9a06d3 100644 --- a/data/maps/OldaleTown_House2/scripts.inc +++ b/data/maps/OldaleTown_House2/scripts.inc @@ -2,11 +2,11 @@ OldaleTown_House2_MapScripts:: @ 81FBF5A .byte 0 OldaleTown_House2_EventScript_1FBF5B:: @ 81FBF5B - msgbox OldaleTown_House2_Text_1FBF6D, 2 + msgbox OldaleTown_House2_Text_1FBF6D, MSGBOX_NPC end OldaleTown_House2_EventScript_1FBF64:: @ 81FBF64 - msgbox OldaleTown_House2_Text_1FBFB0, 2 + msgbox OldaleTown_House2_Text_1FBFB0, MSGBOX_NPC end OldaleTown_House2_Text_1FBF6D: @ 81FBF6D @@ -15,6 +15,6 @@ OldaleTown_House2_Text_1FBF6D: @ 81FBF6D OldaleTown_House2_Text_1FBFB0: @ 81FBFB0 .string "If the POKéMON with you become\n" - .string "stronger, you’ll be able to go farther\l" + .string "stronger, you'll be able to go farther\l" .string "away from here.$" diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index de8893712..4503a27a8 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -9,7 +9,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -24,7 +24,7 @@ OldaleTown_Mart_Pokemart_1FC260: @ 81FC260 OldaleTown_Mart_EventScript_1FC26C:: @ 81FC26C pokemart OldaleTown_Mart_Pokemart_1FC27C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -44,30 +44,30 @@ OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A faceplayer checkflag FLAG_0x074 goto_eq OldaleTown_Mart_EventScript_1FC29F - msgbox OldaleTown_Mart_Text_1FC2B2, 4 + msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC29F:: @ 81FC29F - msgbox OldaleTown_Mart_Text_1FC2F3, 4 + msgbox OldaleTown_Mart_Text_1FC2F3, MSGBOX_DEFAULT release end OldaleTown_Mart_EventScript_1FC2A9:: @ 81FC2A9 - msgbox OldaleTown_Mart_Text_1FC338, 2 + msgbox OldaleTown_Mart_Text_1FC338, MSGBOX_NPC end OldaleTown_Mart_Text_1FC2B2: @ 81FC2B2 - .string "The clerk says they’re all sold out.\n" - .string "I can’t buy any POKé BALLS.$" + .string "The clerk says they're all sold out.\n" + .string "I can't buy any POKé BALLS.$" OldaleTown_Mart_Text_1FC2F3: @ 81FC2F3 - .string "I’m going to buy a bunch of POKé BALLS\n" + .string "I'm going to buy a bunch of POKé BALLS\n" .string "and catch a bunch of POKéMON!$" OldaleTown_Mart_Text_1FC338: @ 81FC338 .string "If a POKéMON gets hurt and loses its HP\n" - .string "and faints, it won’t be able to battle.\p" + .string "and faints, it won't be able to battle.\p" .string "To prevent your POKéMON from fainting,\n" .string "restore its HP with a POTION.$" diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index e99e628a6..af104c674 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -17,11 +17,11 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC01A:: @ 81FC01A end OldaleTown_PokemonCenter_1F_EventScript_1FC028:: @ 81FC028 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC059, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC031:: @ 81FC031 - msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, 2 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC0CD, MSGBOX_NPC end OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A @@ -29,31 +29,31 @@ OldaleTown_PokemonCenter_1F_EventScript_1FC03A:: @ 81FC03A faceplayer checkflag FLAG_SYS_POKEDEX_GET goto_eq OldaleTown_PokemonCenter_1F_EventScript_1FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC148, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_1F_EventScript_1FC04F:: @ 81FC04F - msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, 4 + msgbox OldaleTown_PokemonCenter_1F_Text_1FC1B9, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_1F_Text_1FC059: @ 81FC059 .string "That PC in the corner there is\n" .string "for any POKéMON TRAINER to use.\p" - .string "Naturally, that means you’re welcome\n" + .string "Naturally, that means you're welcome\n" .string "to use it, too.$" OldaleTown_PokemonCenter_1F_Text_1FC0CD: @ 81FC0CD .string "POKéMON CENTERS are great!\p" .string "You can use their services as much\n" - .string "as you like, and it’s all for free.\l" + .string "as you like, and it's all for free.\l" .string "You never have to worry!$" OldaleTown_PokemonCenter_1F_Text_1FC148: @ 81FC148 .string "The POKéMON WIRELESS CLUB on\n" .string "the second floor was built recently.\p" - .string "But they say they’re still making\n" + .string "But they say they're still making\n" .string "adjustments.$" OldaleTown_PokemonCenter_1F_Text_1FC1B9: @ 81FC1B9 diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 1f4f0e872..6125ed386 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -12,19 +12,19 @@ PacifidlogTown_MapScript1_1EBAC0: @ 81EBAC0 end PacifidlogTown_EventScript_1EBAC3:: @ 81EBAC3 - msgbox PacifidlogTown_Text_1EBB6C, 2 + msgbox PacifidlogTown_Text_1EBB6C, MSGBOX_NPC end PacifidlogTown_EventScript_1EBACC:: @ 81EBACC - msgbox PacifidlogTown_Text_1EBAE7, 2 + msgbox PacifidlogTown_Text_1EBAE7, MSGBOX_NPC end PacifidlogTown_EventScript_1EBAD5:: @ 81EBAD5 - msgbox PacifidlogTown_Text_1EBBAC, 2 + msgbox PacifidlogTown_Text_1EBBAC, MSGBOX_NPC end PacifidlogTown_EventScript_1EBADE:: @ 81EBADE - msgbox PacifidlogTown_Text_1EBC7A, 3 + msgbox PacifidlogTown_Text_1EBC7A, MSGBOX_SIGN end PacifidlogTown_Text_1EBAE7: @ 81EBAE7 @@ -34,7 +34,7 @@ PacifidlogTown_Text_1EBAE7: @ 81EBAE7 .string "up swept away somewhere else.$" PacifidlogTown_Text_1EBB6C: @ 81EBB6C - .string "See, isn’t it neat?\n" + .string "See, isn't it neat?\n" .string "These houses are on water!\p" .string "I was born here!$" @@ -42,8 +42,8 @@ PacifidlogTown_Text_1EBBAC: @ 81EBBAC .string "The SKY PILLAR?\p" .string "…Oh, you must mean that tall, tall\n" .string "tower a little further out.\p" - .string "If you asked me, I wouldn’t climb it.\n" - .string "It’s too scary to get up that high.\p" + .string "If you asked me, I wouldn't climb it.\n" + .string "It's too scary to get up that high.\p" .string "Life at sea level in PACIFIDLOG,\n" .string "that suits me fine.$" diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc index b4fe4c979..937b645bc 100644 --- a/data/maps/PacifidlogTown_House1/scripts.inc +++ b/data/maps/PacifidlogTown_House1/scripts.inc @@ -2,11 +2,11 @@ PacifidlogTown_House1_MapScripts:: @ 820365C .byte 0 PacifidlogTown_House1_EventScript_20365D:: @ 820365D - msgbox PacifidlogTown_House1_Text_20366F, 2 + msgbox PacifidlogTown_House1_Text_20366F, MSGBOX_NPC end PacifidlogTown_House1_EventScript_203666:: @ 8203666 - msgbox PacifidlogTown_House1_Text_20373A, 2 + msgbox PacifidlogTown_House1_Text_20373A, MSGBOX_NPC end PacifidlogTown_House1_Text_20366F: @ 820366F @@ -15,11 +15,11 @@ PacifidlogTown_House1_Text_20366F: @ 820366F .string "rock, ice, and steel.\p" .string "Each of them is said to hide away deep\n" .string "inside caves.\p" - .string "That’s the story I heard when I was\n" + .string "That's the story I heard when I was\n" .string "just a little kid.$" PacifidlogTown_House1_Text_20373A: @ 820373A .string "“Six dots open three doors.”\p" - .string "Grandpa used to say that, but I don’t\n" + .string "Grandpa used to say that, but I don't\n" .string "know what he meant.$" diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 21345242d..41242ab44 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -31,12 +31,12 @@ PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE return PacifidlogTown_House2_EventScript_2037F8:: @ 82037F8 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203801:: @ 8203801 - msgbox PacifidlogTown_House2_Text_2038C7, 4 - msgbox PacifidlogTown_House2_Text_20395B, 4 + msgbox PacifidlogTown_House2_Text_2038C7, MSGBOX_DEFAULT + msgbox PacifidlogTown_House2_Text_20395B, MSGBOX_DEFAULT return PacifidlogTown_House2_EventScript_203812:: @ 8203812 @@ -44,36 +44,36 @@ PacifidlogTown_House2_EventScript_203812:: @ 8203812 return PacifidlogTown_House2_EventScript_203816:: @ 8203816 - msgbox PacifidlogTown_House2_Text_20396D, 4 + msgbox PacifidlogTown_House2_Text_20396D, MSGBOX_DEFAULT giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_203845:: @ 8203845 - msgbox PacifidlogTown_House2_Text_2039CE, 4 + msgbox PacifidlogTown_House2_Text_2039CE, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20384F:: @ 820384F - msgbox PacifidlogTown_House2_Text_203A2F, 4 + msgbox PacifidlogTown_House2_Text_203A2F, MSGBOX_DEFAULT giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_eq PacifidlogTown_House2_EventScript_272054 setflag FLAG_0x12B special SetPacifidlogTMReceivedDay - msgbox PacifidlogTown_House2_Text_203A85, 4 + msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release end PacifidlogTown_House2_EventScript_20387E:: @ 820387E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, VAR_RESULT - msgbox PacifidlogTown_House2_Text_203AF4, 4 + msgbox PacifidlogTown_House2_Text_203AF4, MSGBOX_DEFAULT release end @@ -82,9 +82,9 @@ PacifidlogTown_House2_EventScript_203891:: @ 8203891 faceplayer waitse playmoncry SPECIES_AZURILL, 0 - msgbox PacifidlogTown_House2_Text_203B8D, 4 + msgbox PacifidlogTown_House2_Text_203B8D, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203B9D, 4 + msgbox PacifidlogTown_House2_Text_203B9D, MSGBOX_DEFAULT release end @@ -93,18 +93,18 @@ PacifidlogTown_House2_EventScript_2038AC:: @ 82038AC faceplayer waitse playmoncry SPECIES_AZURILL, 2 - msgbox PacifidlogTown_House2_Text_203BCE, 4 + msgbox PacifidlogTown_House2_Text_203BCE, MSGBOX_DEFAULT waitmoncry - msgbox PacifidlogTown_House2_Text_203BDF, 4 + msgbox PacifidlogTown_House2_Text_203BDF, MSGBOX_DEFAULT release end PacifidlogTown_House2_Text_2038C7: @ 82038C7 .string "Er-hem!\p" - .string "I am the POKéMON FAN CLUB’s most\n" - .string "important person, the CHAIRMAN’s\l" + .string "I am the POKéMON FAN CLUB's most\n" + .string "important person, the CHAIRMAN's\l" .string "younger brother.\p" - .string "I’m here enjoying my vacation with\n" + .string "I'm here enjoying my vacation with\n" .string "POKéMON, yes, indeed.$" PacifidlogTown_House2_Text_20395B: @ 820395B @@ -118,7 +118,7 @@ PacifidlogTown_House2_Text_20396D: @ 820396D PacifidlogTown_House2_Text_2039CE: @ 82039CE .string "Hmm…\n" - .string "It’s not bad, but it’s also not good.\p" + .string "It's not bad, but it's also not good.\p" .string "You, as the TRAINER, need to put in\n" .string "some more effort.$" @@ -128,16 +128,16 @@ PacifidlogTown_House2_Text_203A2F: @ 8203A2F .string "deserves a TM like this.$" PacifidlogTown_House2_Text_203A85: @ 8203A85 - .string "If a POKéMON likes you a lot, RETURN’s\n" + .string "If a POKéMON likes you a lot, RETURN's\n" .string "power is enhanced.\p" - .string "If it doesn’t like you, FRUSTRATION’s\n" + .string "If it doesn't like you, FRUSTRATION's\n" .string "power goes up.$" PacifidlogTown_House2_Text_203AF4: @ 8203AF4 .string "Oh, yes. In about {STR_VAR_1} or so days,\n" .string "I should be getting a good TM or two.\p" .string "You should come see me then.\n" - .string "I’ll give you a TM that’s suitable for\l" + .string "I'll give you a TM that's suitable for\l" .string "your POKéMON.$" PacifidlogTown_House2_Text_203B8D: @ 8203B8D @@ -151,6 +151,6 @@ PacifidlogTown_House2_Text_203BCE: @ 8203BCE .string "AZURILL: Rururi!$" PacifidlogTown_House2_Text_203BDF: @ 8203BDF - .string "It doesn’t appear to like the TRAINER\n" + .string "It doesn't appear to like the TRAINER\n" .string "very much.$" diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 98977b766..d7b83f70a 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -10,7 +10,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox PacifidlogTown_House3_Text_203CBE, 5 + msgbox PacifidlogTown_House3_Text_203CBE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq PacifidlogTown_House3_EventScript_203C93 special sub_81B94B0 @@ -29,54 +29,54 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 special sub_807F0E4 waitstate bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203D87, 4 + msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT setflag FLAG_0x09A release end PacifidlogTown_House3_EventScript_203C93:: @ 8203C93 - msgbox PacifidlogTown_House3_Text_203E12, 4 + msgbox PacifidlogTown_House3_Text_203E12, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203C9D:: @ 8203C9D bufferspeciesname 0, VAR_0x8009 - msgbox PacifidlogTown_House3_Text_203DDE, 4 + msgbox PacifidlogTown_House3_Text_203DDE, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CAB:: @ 8203CAB - msgbox PacifidlogTown_House3_Text_203E7F, 4 + msgbox PacifidlogTown_House3_Text_203E7F, MSGBOX_DEFAULT release end PacifidlogTown_House3_EventScript_203CB5:: @ 8203CB5 - msgbox PacifidlogTown_House3_Text_203EF1, 2 + msgbox PacifidlogTown_House3_Text_203EF1, MSGBOX_NPC end PacifidlogTown_House3_Text_203CBE: @ 8203CBE .string "Check out this {STR_VAR_2}!\p" - .string "It’s the {STR_VAR_2} that I caught\n" + .string "It's the {STR_VAR_2} that I caught\n" .string "yesterday to celebrate my birthday!\p" .string "Oh, I can see that you want it!\n" - .string "After all, it’s priceless!\p" - .string "I’ll tell you what. I might be willing\n" + .string "After all, it's priceless!\p" + .string "I'll tell you what. I might be willing\n" .string "to trade it for a {STR_VAR_1}.$" PacifidlogTown_House3_Text_203D87: @ 8203D87 .string "Oh, so this is a {STR_VAR_1}?\p" - .string "It’s sort of like a {STR_VAR_2},\n" - .string "and yet it’s subtly different.\p" + .string "It's sort of like a {STR_VAR_2},\n" + .string "and yet it's subtly different.\p" .string "Thank you!$" PacifidlogTown_House3_Text_203DDE: @ 8203DDE - .string "No, no, no! I won’t accept any\n" + .string "No, no, no! I won't accept any\n" .string "less than a real {STR_VAR_1}!$" PacifidlogTown_House3_Text_203E12: @ 8203E12 - .string "Oh, so you’re not going to go through\n" + .string "Oh, so you're not going to go through\n" .string "with this?\p" - .string "That’s cool. I’m not desperate to make\n" + .string "That's cool. I'm not desperate to make\n" .string "a trade or anything.$" PacifidlogTown_House3_Text_203E7F: @ 8203E7F diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index a3e9cf0a4..2e9a06e0b 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -2,17 +2,17 @@ PacifidlogTown_House4_MapScripts:: @ 8203F4B .byte 0 PacifidlogTown_House4_EventScript_203F4C:: @ 8203F4C - msgbox PacifidlogTown_House4_Text_204017, 2 + msgbox PacifidlogTown_House4_Text_204017, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F55:: @ 8203F55 - msgbox PacifidlogTown_House4_Text_203F93, 2 + msgbox PacifidlogTown_House4_Text_203F93, MSGBOX_NPC end PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E lock faceplayer - msgbox PacifidlogTown_House4_Text_204035, 5 + msgbox PacifidlogTown_House4_Text_204035, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PacifidlogTown_House4_EventScript_203F7F compare VAR_RESULT, 0 @@ -20,12 +20,12 @@ PacifidlogTown_House4_EventScript_203F5E:: @ 8203F5E end PacifidlogTown_House4_EventScript_203F7F:: @ 8203F7F - msgbox PacifidlogTown_House4_Text_20404E, 4 + msgbox PacifidlogTown_House4_Text_20404E, MSGBOX_DEFAULT release end PacifidlogTown_House4_EventScript_203F89:: @ 8203F89 - msgbox PacifidlogTown_House4_Text_204084, 4 + msgbox PacifidlogTown_House4_Text_204084, MSGBOX_DEFAULT release end @@ -33,7 +33,7 @@ PacifidlogTown_House4_Text_203F93: @ 8203F93 .string "People were saying they saw a POKéMON\n" .string "flying high above HOENN.\p" .string "Is it flying around all the time?\n" - .string "Doesn’t it need to rest somewhere?$" + .string "Doesn't it need to rest somewhere?$" PacifidlogTown_House4_Text_204017: @ 8204017 .string "A sky POKéMON!\n" @@ -45,11 +45,11 @@ PacifidlogTown_House4_Text_204035: @ 8204035 PacifidlogTown_House4_Text_20404E: @ 820404E .string "Yes?\n" .string "YES TOWN?\p" - .string "I’ve never heard of a place like that.$" + .string "I've never heard of a place like that.$" PacifidlogTown_House4_Text_204084: @ 8204084 - .string "No? That doesn’t make any sense.\n" + .string "No? That doesn't make any sense.\n" .string "You have to come from somewhere.\p" - .string "Oh! Wait! You’re not going to say you\n" + .string "Oh! Wait! You're not going to say you\n" .string "were born at the bottom of the sea?$" diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index ec97a639e..d9d9f0c56 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -7,21 +7,21 @@ PacifidlogTown_House5_EventScript_204111:: @ 8204111 specialvar VAR_RESULT, IsMirageIslandPresent compare VAR_RESULT, 1 goto_eq PacifidlogTown_House5_EventScript_20412D - msgbox PacifidlogTown_House5_Text_204140, 4 + msgbox PacifidlogTown_House5_Text_204140, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_20412D:: @ 820412D - msgbox PacifidlogTown_House5_Text_204161, 4 + msgbox PacifidlogTown_House5_Text_204161, MSGBOX_DEFAULT release end PacifidlogTown_House5_EventScript_204137:: @ 8204137 - msgbox PacifidlogTown_House5_Text_20418B, 2 + msgbox PacifidlogTown_House5_Text_20418B, MSGBOX_NPC end PacifidlogTown_House5_Text_204140: @ 8204140 - .string "I can’t see MIRAGE ISLAND today…$" + .string "I can't see MIRAGE ISLAND today…$" PacifidlogTown_House5_Text_204161: @ 8204161 .string "Oh! Oh my!\n" diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 65af1cdc7..ddad843fb 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -16,20 +16,20 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2034B6:: @ 82034B6 end PacifidlogTown_PokemonCenter_1F_EventScript_2034C4:: @ 82034C4 - msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_2034DF, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034CD:: @ 82034CD - msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20350F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_EventScript_2034D6:: @ 82034D6 - msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, 2 + msgbox PacifidlogTown_PokemonCenter_1F_Text_20356F, MSGBOX_NPC end PacifidlogTown_PokemonCenter_1F_Text_2034DF: @ 82034DF .string "What color is your TRAINER CARD?\n" - .string "Mine’s copper!$" + .string "Mine's copper!$" PacifidlogTown_PokemonCenter_1F_Text_20350F: @ 820350F .string "PACIFIDLOG TOWN floats on top of\n" diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 5eda45fb8..bdffb6814 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -35,13 +35,13 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E applymovement 2, PetalburgCity_Movement_1DC451 applymovement 255, PetalburgCity_Movement_1DC430 waitmovement 0 - msgbox PetalburgCity_Text_1EC1F8, 4 + msgbox PetalburgCity_Text_1EC1F8, MSGBOX_DEFAULT special StartWallyTutorialBattle waitstate - msgbox PetalburgCity_Text_1EC271, 4 + msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT applymovement 2, PetalburgCity_Movement_2725A4, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY - msgbox PetalburgCity_Text_1EC297, 4 + msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT closemessage clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x4057, 3 @@ -82,7 +82,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390 PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 lock faceplayer - msgbox PetalburgCity_Text_1DC985, 4 + msgbox PetalburgCity_Text_1DC985, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgCity_Movement_2725A2 waitmovement 0 @@ -90,7 +90,7 @@ PetalburgCity_EventScript_1DC3E6:: @ 81DC3E6 end PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD - msgbox PetalburgCity_Text_1DC837, 2 + msgbox PetalburgCity_Text_1DC837, MSGBOX_NPC end PetalburgCity_Movement_1DC406: @ 81DC406 @@ -218,19 +218,19 @@ PetalburgCity_Movement_1DC451: @ 81DC451 step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 - msgbox PetalburgCity_Text_1DCAAA, 3 + msgbox PetalburgCity_Text_1DCAAA, MSGBOX_SIGN end PetalburgCity_EventScript_1DC47F:: @ 81DC47F - msgbox PetalburgCity_Text_1DCAF1, 3 + msgbox PetalburgCity_Text_1DCAF1, MSGBOX_SIGN end PetalburgCity_EventScript_1DC488:: @ 81DC488 - msgbox PetalburgCity_Text_1DCA30, 2 + msgbox PetalburgCity_Text_1DCA30, MSGBOX_NPC end PetalburgCity_EventScript_1DC491:: @ 81DC491 - msgbox PetalburgCity_Text_1DCB23, 3 + msgbox PetalburgCity_Text_1DCB23, MSGBOX_SIGN end PetalburgCity_EventScript_1DC49A:: @ 81DC49A @@ -274,7 +274,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC59F compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5B4 - msgbox PetalburgCity_Text_1DC881, 4 + msgbox PetalburgCity_Text_1DC881, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC5C9 @@ -284,11 +284,11 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA call_if 1, PetalburgCity_EventScript_1DC5ED compare VAR_0x8008, 3 call_if 1, PetalburgCity_EventScript_1DC5FF - msgbox PetalburgCity_Text_1DC91B, 4 + msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT applymovement 8, PetalburgCity_Movement_2725A8 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 - msgbox PetalburgCity_Text_1DC93E, 4 + msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT closemessage applymovement 8, PetalburgCity_Movement_1DC658 waitmovement 0 @@ -547,17 +547,17 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 applymovement 255, PetalburgCity_Movement_2725A8 waitmovement 0 setvar VAR_0x40D1, 1 - msgbox PetalburgCity_Text_1DCB31, 4 + msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A8 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCB82, 4 + msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT closemessage applymovement 9, PetalburgCity_Movement_2725A4 waitmovement 0 delay 30 - msgbox PetalburgCity_Text_1DCC09, 4 + msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, PetalburgCity_EventScript_1DC78E @@ -705,7 +705,7 @@ PetalburgCity_Movement_1DC828: @ 81DC828 step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E - msgbox PetalburgCity_Text_1DC881, 2 + msgbox PetalburgCity_Text_1DC881, MSGBOX_NPC end PetalburgCity_Text_1DC837: @ 81DC837 @@ -722,21 +722,21 @@ PetalburgCity_Text_1DC881: @ 81DC881 .string "is in the town.$" PetalburgCity_Text_1DC91B: @ 81DC91B - .string "See? This is PETALBURG CITY’s GYM.$" + .string "See? This is PETALBURG CITY's GYM.$" PetalburgCity_Text_1DC93E: @ 81DC93E - .string "This is the GYM’s sign. Look for it\n" - .string "whenever you’re looking for a GYM.$" + .string "This is the GYM's sign. Look for it\n" + .string "whenever you're looking for a GYM.$" PetalburgCity_Text_1DC985: @ 81DC985 .string "My face is reflected in the water.\p" - .string "It’s a shining grin full of hope…\p" + .string "It's a shining grin full of hope…\p" .string "Or it could be a look of somber silence\n" .string "struggling with fear…\p" .string "What do you see reflected in your face?$" PetalburgCity_Text_1DCA30: @ 81DCA30 - .string "Let’s say you have six POKéMON.\n" + .string "Let's say you have six POKéMON.\n" .string "If you catch another one…\p" .string "It is automatically sent to a STORAGE\n" .string "BOX over a PC connection.$" @@ -751,21 +751,21 @@ PetalburgCity_Text_1DCAF1: @ 81DCAF1 .string "“Where people mingle with nature.”$" PetalburgCity_Text_1DCB23: @ 81DCB23 - .string "WALLY’S HOUSE$" + .string "WALLY'S HOUSE$" PetalburgCity_Text_1DCB31: @ 81DCB31 .string "Excuse me!\p" - .string "Let me guess, from the way you’re\n" + .string "Let me guess, from the way you're\n" .string "dressed, are you a POKéMON TRAINER?$" PetalburgCity_Text_1DCB82: @ 81DCB82 .string "… … … … … …\p" .string "Well, maybe not.\n" - .string "Your clothes aren’t all that dirty.\p" - .string "You’re either a rookie TRAINER,\n" - .string "or maybe you’re just an ordinary kid.$" + .string "Your clothes aren't all that dirty.\p" + .string "You're either a rookie TRAINER,\n" + .string "or maybe you're just an ordinary kid.$" PetalburgCity_Text_1DCC09: @ 81DCC09 - .string "I’m roaming the land in search of\n" + .string "I'm roaming the land in search of\n" .string "talented TRAINERS.\p" - .string "I’m sorry to have taken your time.$" + .string "I'm sorry to have taken your time.$" diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index 9347397ff..6a58c20f7 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -88,8 +88,8 @@ PetalburgCity_Gym_MapScript2_20499A: @ 820499A PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 lockall - msgbox PetalburgCity_Gym_Text_205B32, 4 - msgbox PetalburgCity_Gym_Text_205B4C, 4 + msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT closemessage applymovement 255, PetalburgCity_Gym_Movement_2725AA applymovement 10, PetalburgCity_Gym_Movement_2049EC @@ -100,7 +100,7 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 delay 30 applymovement 255, PetalburgCity_Gym_Movement_2725A6 waitmovement 0 - msgbox PetalburgCity_Gym_Text_205C40, 4 + msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT setvar VAR_0x4085, 2 releaseall end @@ -123,7 +123,7 @@ PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 case 6, PetalburgCity_Gym_EventScript_204E3B case 7, PetalburgCity_Gym_EventScript_204D80 case 8, PetalburgCity_Gym_EventScript_204DB3 - msgbox PetalburgCity_Gym_Text_2057A2, 4 + msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT closemessage switch VAR_FACING case 1, PetalburgCity_Gym_EventScript_204A80 @@ -163,10 +163,10 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204C5F compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204C5F - msgbox PetalburgCity_Gym_Text_2058B1, 4 - msgbox PetalburgCity_Gym_Text_2058DB, 4 - msgbox PetalburgCity_Gym_Text_205910, 4 - msgbox PetalburgCity_Gym_Text_2059D8, 4 + msgbox PetalburgCity_Gym_Text_2058B1, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2058DB, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205910, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_2059D8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204CC7 compare VAR_0x8008, 1 @@ -175,7 +175,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204CE4 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204CF6 - msgbox PetalburgCity_Gym_Text_2059E8, 4 + msgbox PetalburgCity_Gym_Text_2059E8, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D08 compare VAR_0x8008, 1 @@ -184,9 +184,9 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D1E compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D29 - msgbox PetalburgCity_Gym_Text_205A46, 4 - msgbox PetalburgCity_Gym_Text_205A89, 4 - msgbox PetalburgCity_Gym_Text_205AF4, 4 + msgbox PetalburgCity_Gym_Text_205A46, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205A89, MSGBOX_DEFAULT + msgbox PetalburgCity_Gym_Text_205AF4, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_204D72 compare VAR_0x8008, 1 @@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC call_if 1, PetalburgCity_Gym_EventScript_204D34 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204D34 - msgbox PetalburgCity_Gym_Text_205B0F, 4 + msgbox PetalburgCity_Gym_Text_205B0F, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -328,22 +328,22 @@ PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F return PetalburgCity_Gym_EventScript_204D4A:: @ 8204D4A - msgbox PetalburgCity_Gym_Text_205DB4, 4 + msgbox PetalburgCity_Gym_Text_205DB4, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D54:: @ 8204D54 - msgbox PetalburgCity_Gym_Text_205EAE, 4 + msgbox PetalburgCity_Gym_Text_205EAE, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D5E:: @ 8204D5E - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_204D68:: @ 8204D68 - msgbox PetalburgCity_Gym_Text_205F87, 4 + msgbox PetalburgCity_Gym_Text_205F87, MSGBOX_DEFAULT release end @@ -369,7 +369,7 @@ PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 goto_if 0, PetalburgCity_Gym_EventScript_204DAC checkflag FLAG_SYS_GAME_CLEAR goto_eq PetalburgCity_Gym_EventScript_20512D - msgbox PetalburgCity_Gym_Text_206417, 4 + msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release end @@ -379,8 +379,8 @@ PetalburgCity_Gym_EventScript_204DAC:: @ 8204DAC end PetalburgCity_Gym_EventScript_204DB3:: @ 8204DB3 - trainerbattle 7, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A - msgbox PetalburgCity_Gym_Text_2075F7, 6 + trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_2074A2, PetalburgCity_Gym_Text_2075CE, PetalburgCity_Gym_Text_20764A + msgbox PetalburgCity_Gym_Text_2075F7, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE @@ -395,7 +395,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE goto_eq PetalburgCity_Gym_EventScript_204E17 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_eq PetalburgCity_Gym_EventScript_204E17 - msgbox PetalburgCity_Gym_Text_2A6D3D, 4 + msgbox PetalburgCity_Gym_Text_2A6D3D, MSGBOX_DEFAULT setvar VAR_RESULT, 1 return @@ -412,12 +412,12 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D end PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B - msgbox PetalburgCity_Gym_Text_205FE5, 4 - trainerbattle 3, TRAINER_NORMAN_1, 0, PetalburgCity_Gym_Text_206107 + msgbox PetalburgCity_Gym_Text_205FE5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_206107 message PetalburgCity_Gym_Text_206162 waitmessage call PetalburgCity_Gym_EventScript_27207E - msgbox PetalburgCity_Gym_Text_20618A, 4 + msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT setflag FLAG_0x4F4 setvar VAR_0x4085, 7 setflag FLAG_BADGE05_GET @@ -432,7 +432,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B special DrawWholeMapView call PetalburgCity_Gym_EventScript_204ED2 delay 30 - msgbox PetalburgCity_Gym_Text_2062FB, 4 + msgbox PetalburgCity_Gym_Text_2062FB, MSGBOX_DEFAULT closemessage delay 40 playse SE_DOOR @@ -449,7 +449,7 @@ PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 compare VAR_RESULT, 0 goto_eq PetalburgCity_Gym_EventScript_27205E setflag FLAG_0x0A9 - msgbox PetalburgCity_Gym_Text_206254, 4 + msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return PetalburgCity_Gym_EventScript_204EF5:: @ 8204EF5 @@ -479,7 +479,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_205009 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_205025 - msgbox PetalburgCity_Gym_Text_206377, 4 + msgbox PetalburgCity_Gym_Text_206377, MSGBOX_DEFAULT closemessage delay 20 compare VAR_0x8008, 1 @@ -488,7 +488,7 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13 call_if 1, PetalburgCity_Gym_EventScript_204FD7 compare VAR_0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_204FE2 - msgbox PetalburgCity_Gym_Text_2063CA, 4 + msgbox PetalburgCity_Gym_Text_2063CA, MSGBOX_DEFAULT closemessage setflag FLAG_SPECIAL_FLAG_0x4001 playbgm MUS_TSURETEK, 0 @@ -780,7 +780,7 @@ PetalburgCity_Gym_Movement_205123: @ 8205123 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D - msgbox PetalburgCity_Gym_Text_2064C3, 4 + msgbox PetalburgCity_Gym_Text_2064C3, MSGBOX_DEFAULT release end @@ -790,7 +790,7 @@ PetalburgCity_Gym_EventScript_205137:: @ 8205137 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 85 - msgbox PetalburgCity_Gym_Text_20721E, 5 + msgbox PetalburgCity_Gym_Text_20721E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -810,7 +810,7 @@ PetalburgCity_Gym_EventScript_20517B:: @ 820517B end PetalburgCity_Gym_EventScript_20517D:: @ 820517D - msgbox PetalburgCity_Gym_Text_2071F4, 4 + msgbox PetalburgCity_Gym_Text_2071F4, MSGBOX_DEFAULT releaseall end @@ -820,7 +820,7 @@ PetalburgCity_Gym_EventScript_205187:: @ 8205187 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 98 - msgbox PetalburgCity_Gym_Text_207280, 5 + msgbox PetalburgCity_Gym_Text_207280, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -833,7 +833,7 @@ PetalburgCity_Gym_EventScript_2051BC:: @ 82051BC goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 46 - msgbox PetalburgCity_Gym_Text_2072BB, 5 + msgbox PetalburgCity_Gym_Text_2072BB, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_2051EF:: @ 82051EF goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -859,7 +859,7 @@ PetalburgCity_Gym_EventScript_205222:: @ 8205222 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 59 - msgbox PetalburgCity_Gym_Text_2072F7, 5 + msgbox PetalburgCity_Gym_Text_2072F7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -872,7 +872,7 @@ PetalburgCity_Gym_EventScript_205255:: @ 8205255 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 72 - msgbox PetalburgCity_Gym_Text_207331, 5 + msgbox PetalburgCity_Gym_Text_207331, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -885,7 +885,7 @@ PetalburgCity_Gym_EventScript_205288:: @ 8205288 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -898,7 +898,7 @@ PetalburgCity_Gym_EventScript_2052BB:: @ 82052BB goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 20 - msgbox PetalburgCity_Gym_Text_20736C, 5 + msgbox PetalburgCity_Gym_Text_20736C, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -911,7 +911,7 @@ PetalburgCity_Gym_EventScript_2052EE:: @ 82052EE goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -924,7 +924,7 @@ PetalburgCity_Gym_EventScript_205321:: @ 8205321 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 33 - msgbox PetalburgCity_Gym_Text_2073A7, 5 + msgbox PetalburgCity_Gym_Text_2073A7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -937,7 +937,7 @@ PetalburgCity_Gym_EventScript_205354:: @ 8205354 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 1 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -950,7 +950,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 goto_if 0, PetalburgCity_Gym_EventScript_20517D setvar VAR_0x8008, 7 setvar VAR_0x8009, 7 - msgbox PetalburgCity_Gym_Text_2073E4, 5 + msgbox PetalburgCity_Gym_Text_2073E4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq PetalburgCity_Gym_EventScript_20516C compare VAR_RESULT, 0 @@ -958,10 +958,10 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 end PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA - trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE + trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2053ED - msgbox PetalburgCity_Gym_Text_2067D8, 6 + msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE @@ -972,14 +972,14 @@ PetalburgCity_Gym_EventScript_2053DE:: @ 82053DE end PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED - msgbox PetalburgCity_Gym_Text_20685E, 2 + msgbox PetalburgCity_Gym_Text_20685E, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 - trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A + trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205429 - msgbox PetalburgCity_Gym_Text_206996, 6 + msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20541A:: @ 820541A @@ -990,14 +990,14 @@ PetalburgCity_Gym_EventScript_20541A:: @ 820541A end PetalburgCity_Gym_EventScript_205429:: @ 8205429 - msgbox PetalburgCity_Gym_Text_2069D9, 2 + msgbox PetalburgCity_Gym_Text_2069D9, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205432:: @ 8205432 - trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 + trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205465 - msgbox PetalburgCity_Gym_Text_206AE9, 6 + msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205456:: @ 8205456 @@ -1008,14 +1008,14 @@ PetalburgCity_Gym_EventScript_205456:: @ 8205456 end PetalburgCity_Gym_EventScript_205465:: @ 8205465 - msgbox PetalburgCity_Gym_Text_206BB1, 2 + msgbox PetalburgCity_Gym_Text_206BB1, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20546E:: @ 820546E - trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 + trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054A1 - msgbox PetalburgCity_Gym_Text_206C9F, 6 + msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205492:: @ 8205492 @@ -1026,14 +1026,14 @@ PetalburgCity_Gym_EventScript_205492:: @ 8205492 end PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 - msgbox PetalburgCity_Gym_Text_206D56, 2 + msgbox PetalburgCity_Gym_Text_206D56, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA - trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE + trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_2054DD - msgbox PetalburgCity_Gym_Text_206E26, 6 + msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE @@ -1044,14 +1044,14 @@ PetalburgCity_Gym_EventScript_2054CE:: @ 82054CE end PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD - msgbox PetalburgCity_Gym_Text_206ED8, 2 + msgbox PetalburgCity_Gym_Text_206ED8, MSGBOX_NPC end PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 - trainerbattle 2, TRAINER_ALEXIA, 0, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A + trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205519 - msgbox PetalburgCity_Gym_Text_206F9F, 6 + msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_20550A:: @ 820550A @@ -1062,14 +1062,14 @@ PetalburgCity_Gym_EventScript_20550A:: @ 820550A end PetalburgCity_Gym_EventScript_205519:: @ 8205519 - msgbox PetalburgCity_Gym_Text_207069, 2 + msgbox PetalburgCity_Gym_Text_207069, MSGBOX_NPC end PetalburgCity_Gym_EventScript_205522:: @ 8205522 - trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 + trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205555 - msgbox PetalburgCity_Gym_Text_2070FB, 6 + msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end PetalburgCity_Gym_EventScript_205546:: @ 8205546 @@ -1080,7 +1080,7 @@ PetalburgCity_Gym_EventScript_205546:: @ 8205546 end PetalburgCity_Gym_EventScript_205555:: @ 8205555 - msgbox PetalburgCity_Gym_Text_207170, 2 + msgbox PetalburgCity_Gym_Text_207170, MSGBOX_NPC end PetalburgCity_Gym_EventScript_20555E:: @ 820555E @@ -1217,12 +1217,12 @@ PetalburgCity_Gym_EventScript_20574F:: @ 820574F faceplayer checkflag FLAG_0x4F4 goto_eq PetalburgCity_Gym_EventScript_205764 - msgbox PetalburgCity_Gym_Text_206542, 4 + msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end PetalburgCity_Gym_EventScript_205764:: @ 8205764 - msgbox PetalburgCity_Gym_Text_2066F3, 4 + msgbox PetalburgCity_Gym_Text_2066F3, MSGBOX_DEFAULT release end @@ -1241,43 +1241,43 @@ PetalburgCity_Gym_EventScript_20577E:: @ 820577E end PetalburgCity_Gym_EventScript_20578E:: @ 820578E - msgbox PetalburgCity_Gym_Text_207467, 4 + msgbox PetalburgCity_Gym_Text_207467, MSGBOX_DEFAULT releaseall end PetalburgCity_Gym_EventScript_205798:: @ 8205798 - msgbox PetalburgCity_Gym_Text_20744C, 4 + msgbox PetalburgCity_Gym_Text_20744C, MSGBOX_DEFAULT releaseall end PetalburgCity_Gym_Text_2057A2: @ 82057A2 .string "DAD: Hm?\p" - .string "Well, if it isn’t {PLAYER}!\n" - .string "So you’re all finished moving in?\p" - .string "I’m surprised that you managed to\n" + .string "Well, if it isn't {PLAYER}!\n" + .string "So you're all finished moving in?\p" + .string "I'm surprised that you managed to\n" .string "get here by yourself.\p" .string "Oh, I see.\n" - .string "You’re with your POKéMON.\p" - .string "Hm… Then I guess you’re going to\n" + .string "You're with your POKéMON.\p" + .string "Hm… Then I guess you're going to\n" .string "become a TRAINER like me, {PLAYER}.\p" - .string "That’s great news!\n" - .string "I’ll be looking forward to it!$" + .string "That's great news!\n" + .string "I'll be looking forward to it!$" PetalburgCity_Gym_Text_2058B1: @ 82058B1 .string "Um… I…\n" - .string "I’d like to get a POKéMON, please…$" + .string "I'd like to get a POKéMON, please…$" PetalburgCity_Gym_Text_2058DB: @ 82058DB - .string "DAD: Hm? You’re… Uh… Oh, right.\n" - .string "You’re WALLY, right?$" + .string "DAD: Hm? You're… Uh… Oh, right.\n" + .string "You're WALLY, right?$" PetalburgCity_Gym_Text_205910: @ 8205910 - .string "WALLY: I’m going to go stay with my\n" + .string "WALLY: I'm going to go stay with my\n" .string "relatives in VERDANTURF TOWN.\p" .string "I thought I would be lonely by myself,\n" .string "so I wanted to take a POKéMON along.\p" - .string "But I’ve never caught a POKéMON before.\n" - .string "I don’t know how…$" + .string "But I've never caught a POKéMON before.\n" + .string "I don't know how…$" PetalburgCity_Gym_Text_2059D8: @ 82059D8 .string "DAD: Hm. I see.$" @@ -1289,13 +1289,13 @@ PetalburgCity_Gym_Text_2059E8: @ 82059E8 .string "safely catches a POKéMON.$" PetalburgCity_Gym_Text_205A46: @ 8205A46 - .string "WALLY, here, I’ll loan you my POKéMON.\p" + .string "WALLY, here, I'll loan you my POKéMON.\p" .string "WALLY received a ZIGZAGOON!$" PetalburgCity_Gym_Text_205A89: @ 8205A89 .string "WALLY: Oh, wow!\n" .string "A POKéMON!\p" - .string "DAD: Hm. I’ll give you a POKé BALL, too.\n" + .string "DAD: Hm. I'll give you a POKé BALL, too.\n" .string "Go for it!\p" .string "WALLY received a POKé BALL!$" @@ -1312,21 +1312,21 @@ PetalburgCity_Gym_Text_205B32: @ 8205B32 PetalburgCity_Gym_Text_205B4C: @ 8205B4C .string "WALLY: Thank you, yes, it did.\n" - .string "Here’s your POKéMON back.\p" + .string "Here's your POKéMON back.\p" .string "{PLAYER}, thank you for coming along\n" .string "with me.\p" .string "You two are why I was able to catch\n" .string "my POKéMON.\p" - .string "I promise I’ll take really good\n" + .string "I promise I'll take really good\n" .string "care of it.\p" - .string "Oh! My mom’s waiting for me,\n" + .string "Oh! My mom's waiting for me,\n" .string "so I have to go!\p" .string "Bye, {PLAYER}!$" PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "DAD: Now…\p" .string "{PLAYER}, if you want to become a\n" - .string "strong TRAINER, here’s my advice.\p" + .string "strong TRAINER, here's my advice.\p" .string "Head for RUSTBORO CITY beyond this\n" .string "town.\p" .string "There, you should challenge\n" @@ -1335,23 +1335,23 @@ PetalburgCity_Gym_Text_205C40: @ 8205C40 .string "GYMS and defeat their LEADERS.\p" .string "Collect BADGES from them,\n" .string "understood?\p" - .string "Of course, I’m a GYM LEADER, too.\n" - .string "We’ll battle one day, {PLAYER}.\p" - .string "But that’s only after you become\n" + .string "Of course, I'm a GYM LEADER, too.\n" + .string "We'll battle one day, {PLAYER}.\p" + .string "But that's only after you become\n" .string "stronger.$" PetalburgCity_Gym_Text_205DB4: @ 8205DB4 - .string "DAD: Hm? Aren’t you going to the\n" + .string "DAD: Hm? Aren't you going to the\n" .string "POKéMON GYM in RUSTBORO CITY?\p" - .string "There’s no challenge for me to\n" + .string "There's no challenge for me to\n" .string "battle a greenhorn TRAINER.\p" .string "{PLAYER}, I want you to challenge me\n" .string "when you become a lot stronger.\p" - .string "I’ll battle you, {PLAYER}, when you\n" + .string "I'll battle you, {PLAYER}, when you\n" .string "can show me four GYM BADGES, okay?$" PetalburgCity_Gym_Text_205EAE: @ 8205EAE - .string "DAD: I see… So, you’ve beaten\n" + .string "DAD: I see… So, you've beaten\n" .string "the GYM LEADER in RUSTBORO CITY.\p" .string "But there are many more TRAINERS\n" .string "who are stronger than you, {PLAYER}.\p" @@ -1363,7 +1363,7 @@ PetalburgCity_Gym_Text_205F87: @ 8205F87 .string "DAD: Hm… {PLAYER}, you have gotten\n" .string "stronger.\p" .string "I can tell by the number of BADGES\n" - .string "that you’ve earned.$" + .string "that you've earned.$" PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "DAD: Hm…\n" @@ -1371,18 +1371,18 @@ PetalburgCity_Gym_Text_205FE5: @ 8205FE5 .string "Fine, as I promised, we will have\n" .string "a POKéMON battle.\p" .string "{PLAYER}…\p" - .string "I’m so happy that I can have\n" + .string "I'm so happy that I can have\n" .string "a real battle with my own child.\p" .string "But, a battle is a battle!\p" .string "I will do everything in my power as\n" .string "a GYM LEADER to win.\p" - .string "{PLAYER}, you’d better give it your\n" + .string "{PLAYER}, you'd better give it your\n" .string "best shot, too!$" PetalburgCity_Gym_Text_206107: @ 8206107 .string "…\p" - .string "I… I can’t…\p" - .string "I can’t believe it. {PLAYER}…\p" + .string "I… I can't…\p" + .string "I can't believe it. {PLAYER}…\p" .string "I lost to {PLAYER}?\p" .string "But, rules are rules!\n" .string "Here, take this.$" @@ -1396,7 +1396,7 @@ PetalburgCity_Gym_Text_20618A: @ 820618A .string "of all your POKéMON will increase.\p" .string "POKéMON that know the HM move SURF\n" .string "will be able to travel over water.\p" - .string "This is my gift to you. {PLAYER}, I’m\n" + .string "This is my gift to you. {PLAYER}, I'm\n" .string "sure you can use it correctly.$" PetalburgCity_Gym_Text_206254: @ 8206254 @@ -1408,10 +1408,10 @@ PetalburgCity_Gym_Text_206254: @ 8206254 .string "situation into an advantage.$" PetalburgCity_Gym_Text_2062FB: @ 82062FB - .string "DAD: As the GYM LEADER, I can’t\n" + .string "DAD: As the GYM LEADER, I can't\n" .string "express how upset I am…\p" .string "But as a father, it makes me both\n" - .string "happy and a little sad. It’s odd…$" + .string "happy and a little sad. It's odd…$" PetalburgCity_Gym_Text_206377: @ 8206377 .string "Ah, there you are, {PLAYER}{KUN}!\p" @@ -1419,14 +1419,14 @@ PetalburgCity_Gym_Text_206377: @ 8206377 .string "I have something I want you to have.$" PetalburgCity_Gym_Text_2063CA: @ 82063CA - .string "NORMAN, you don’t mind, do you?\p" + .string "NORMAN, you don't mind, do you?\p" .string "Let me borrow your {PLAYER}{KUN} for\n" .string "a minute or two.$" PetalburgCity_Gym_Text_206417: @ 8206417 .string "DAD: {PLAYER}, you should go visit\n" .string "your mother every so often.\p" - .string "I’m going to stay here and redouble\n" + .string "I'm going to stay here and redouble\n" .string "my training.\p" .string "It would bother me as a TRAINER to\n" .string "not avenge my loss to you, {PLAYER}!$" @@ -1438,25 +1438,25 @@ PetalburgCity_Gym_Text_2064C3: @ 82064C3 .string "training would ever be enough.$" PetalburgCity_Gym_Text_206542: @ 8206542 - .string "Hey, how’s it going, CHAMPION-\n" + .string "Hey, how's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" .string "The doors in this GYM open when you\n" .string "beat the awaiting TRAINERS.\p" .string "Whoops! The doors in this room are\n" - .string "already open, so don’t attack me!\p" + .string "already open, so don't attack me!\p" .string "The TRAINERS of PETALBURG GYM\n" .string "use all kinds of items.\p" .string "The door at the left leads to\n" .string "the SPEED ROOM.\p" .string "The door at the right leads to\n" .string "the ACCURACY ROOM.\p" - .string "The room’s name will be on\n" + .string "The room's name will be on\n" .string "the door, so choose carefully.\p" - .string "Once you’ve chosen the door…\n" + .string "Once you've chosen the door…\n" .string "Well, hey, go for it!$" PetalburgCity_Gym_Text_2066F3: @ 82066F3 - .string "{PLAYER}! Whoa! You’ve overcome even\n" + .string "{PLAYER}! Whoa! You've overcome even\n" .string "your own father!\p" .string "Like, whoa!\n" .string "What a stunning turn of events!$" @@ -1465,7 +1465,7 @@ PetalburgCity_Gym_Text_20674F: @ 820674F .string "The ability to attack before the\n" .string "opponent…\p" .string "Just that alone puts me at a great\n" - .string "advantage, don’t you agree?$" + .string "advantage, don't you agree?$" PetalburgCity_Gym_Text_2067B9: @ 82067B9 .string "That was a magnificent battle!$" @@ -1481,7 +1481,7 @@ PetalburgCity_Gym_Text_20685E: @ 820685E .string "Whomever you beat, and whomever you\n" .string "may lose to, you never shirk from\l" .string "training yourself and your POKéMON.\p" - .string "That’s what I think being a\n" + .string "That's what I think being a\n" .string "GYM LEADER is all about.$" PetalburgCity_Gym_Text_2068FD: @ 82068FD @@ -1490,7 +1490,7 @@ PetalburgCity_Gym_Text_2068FD: @ 82068FD .string "with your POKéMON!$" PetalburgCity_Gym_Text_20694F: @ 820694F - .string "I couldn’t confuse your team enough…\n" + .string "I couldn't confuse your team enough…\n" .string "You share a strong bond together.$" PetalburgCity_Gym_Text_206996: @ 8206996 @@ -1502,46 +1502,46 @@ PetalburgCity_Gym_Text_2069D9: @ 82069D9 .string "training has become a lot tougher.$" PetalburgCity_Gym_Text_206A1B: @ 8206A1B - .string "Just when you think you’re going to\n" + .string "Just when you think you're going to\n" .string "win, your opponent restores HP…\p" .string "Can you just imagine how awful that\n" .string "must feel?\p" - .string "I’ll show you exactly how awful it\n" + .string "I'll show you exactly how awful it\n" .string "feels!$" PetalburgCity_Gym_Text_206AB8: @ 8206AB8 - .string "I couldn’t restore HP enough…\n" + .string "I couldn't restore HP enough…\n" .string "What ATTACK power…$" PetalburgCity_Gym_Text_206AE9: @ 8206AE9 .string "I should have expected no less from\n" - .string "our LEADER’s kid.\p" - .string "No, wait! A TRAINER’s abilities are\n" + .string "our LEADER's kid.\p" + .string "No, wait! A TRAINER's abilities are\n" .string "earned only through effort.\p" .string "I lost because my own efforts\n" - .string "weren’t enough.\p" + .string "weren't enough.\p" .string "Go on! The ONE-HIT KO ROOM is next.$" PetalburgCity_Gym_Text_206BB1: @ 8206BB1 - .string "I’m going to keep training at GYMS.\n" - .string "One day, I’ll become a LEADER.$" + .string "I'm going to keep training at GYMS.\n" + .string "One day, I'll become a LEADER.$" PetalburgCity_Gym_Text_206BF4: @ 8206BF4 - .string "I’m not going to take it easy just\n" - .string "because you’re our LEADER’s kid.\p" - .string "I’ll show you how horrid it is for\n" + .string "I'm not going to take it easy just\n" + .string "because you're our LEADER's kid.\p" + .string "I'll show you how horrid it is for\n" .string "a POKéMON to take a critical hit!$" PetalburgCity_Gym_Text_206C7D: @ 8206C7D .string "Your power…\n" - .string "You’re the real deal.$" + .string "You're the real deal.$" PetalburgCity_Gym_Text_206C9F: @ 8206C9F .string "Your father really is strong.\n" - .string "He’s a TRAINER worth my respect.\p" + .string "He's a TRAINER worth my respect.\p" .string "And, I sense the same glow coming\n" .string "from you as your father.\p" - .string "I hope that you’ll stage a terrific\n" + .string "I hope that you'll stage a terrific\n" .string "battle with your father!$" PetalburgCity_Gym_Text_206D56: @ 8206D56 @@ -1552,7 +1552,7 @@ PetalburgCity_Gym_Text_206D56: @ 8206D56 PetalburgCity_Gym_Text_206DB2: @ 8206DB2 .string "Giggle…\n" .string "This is the ACCURACY ROOM.\p" - .string "It’s pretty nasty when every attack\n" + .string "It's pretty nasty when every attack\n" .string "lands without fail.$" PetalburgCity_Gym_Text_206E0D: @ 8206E0D @@ -1563,13 +1563,13 @@ PetalburgCity_Gym_Text_206E26: @ 8206E26 .string "TRAINERS waiting for you.\p" .string "The left is the DEFENSE ROOM, and\n" .string "the right is the RECOVERY ROOM.\p" - .string "Your POKéMON’s ATTACK power will be\n" + .string "Your POKéMON's ATTACK power will be\n" .string "on trial either way.$" PetalburgCity_Gym_Text_206ED8: @ 8206ED8 - .string "Do you know what we’re trying to\n" + .string "Do you know what we're trying to\n" .string "achieve as TRAINERS?\p" - .string "We’re striving to become soul mates\n" + .string "We're striving to become soul mates\n" .string "with our POKéMON.$" PetalburgCity_Gym_Text_206F44: @ 8206F44 @@ -1577,10 +1577,10 @@ PetalburgCity_Gym_Text_206F44: @ 8206F44 .string "reckless I can be in attack.$" PetalburgCity_Gym_Text_206F82: @ 8206F82 - .string "Our defenses weren’t enough…$" + .string "Our defenses weren't enough…$" PetalburgCity_Gym_Text_206F9F: @ 8206F9F - .string "I think you’ve taught me a valuable\n" + .string "I think you've taught me a valuable\n" .string "lesson here.\p" .string "Now, go on! The left door goes to\n" .string "the STRENGTH ROOM.\p" @@ -1596,22 +1596,22 @@ PetalburgCity_Gym_Text_207088: @ 8207088 .string "Our GYM LEADER told us to go all out\n" .string "and beat you.\p" .string "Even if you happen to be the\n" - .string "LEADER’s kid!$" + .string "LEADER's kid!$" PetalburgCity_Gym_Text_2070E6: @ 82070E6 .string "But… I went all out!$" PetalburgCity_Gym_Text_2070FB: @ 82070FB .string "The way you use your POKéMON…\n" - .string "It’s like your father’s style.\p" + .string "It's like your father's style.\p" .string "Go on through! The GYM LEADER, your\n" .string "father, is waiting!$" PetalburgCity_Gym_Text_207170: @ 8207170 - .string "Sure, it’s fine to make your POKéMON\n" + .string "Sure, it's fine to make your POKéMON\n" .string "stronger.\p" .string "But what decides the winner?\p" - .string "Why, it’s the feelings TRAINERS have\n" + .string "Why, it's the feelings TRAINERS have\n" .string "for their POKéMON.$" PetalburgCity_Gym_Text_2071F4: @ 82071F4 @@ -1651,7 +1651,7 @@ PetalburgCity_Gym_Text_2073A7: @ 82073A7 .string "Do you want to go through?$" PetalburgCity_Gym_Text_2073E4: @ 82073E4 - .string "“GYM LEADER’S ROOM\p" + .string "“GYM LEADER'S ROOM\p" .string "“See for yourself what POKéMON await\n" .string "you!” the sign says.\p" .string "Do you want to go through?$" @@ -1661,7 +1661,7 @@ PetalburgCity_Gym_Text_20744C: @ 820744C PetalburgCity_Gym_Text_207467: @ 8207467 .string "PETALBURG CITY POKéMON GYM\p" - .string "NORMAN’S CERTIFIED TRAINERS:\n" + .string "NORMAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" PetalburgCity_Gym_Text_2074A2: @ 82074A2 @@ -1669,12 +1669,12 @@ PetalburgCity_Gym_Text_2074A2: @ 82074A2 .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" + .string "You do understand, don't you?\p" + .string "Inside a GYM, it doesn't matter that\n" .string "we are a parent and child.\p" .string "…No, because we are parent and child,\n" .string "we owe it to each other to do the best\l" - .string "we can. Isn’t that right, {PLAYER}?$" + .string "we can. Isn't that right, {PLAYER}?$" PetalburgCity_Gym_Text_2075CE: @ 82075CE .string "Uh… Haha…\n" @@ -1692,12 +1692,12 @@ PetalburgCity_Gym_Text_20764A: @ 820764A .string "I had a feeling that you would come.\p" .string "I would never refuse to accept\n" .string "a challenge from you.\p" - .string "You do understand, don’t you?\p" - .string "Inside a GYM, it doesn’t matter that\n" + .string "You do understand, don't you?\p" + .string "Inside a GYM, it doesn't matter that\n" .string "we are a parent and child.\p" .string "Hm? Wait a second, {PLAYER}.\p" .string "Do you only have one POKéMON that is\n" .string "capable of battle?\p" - .string "Sorry, but you’ll have to come back\n" + .string "Sorry, but you'll have to come back\n" .string "with at least two POKéMON.$" diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc index f727ec8a1..cb511bbed 100644 --- a/data/maps/PetalburgCity_House1/scripts.inc +++ b/data/maps/PetalburgCity_House1/scripts.inc @@ -2,11 +2,11 @@ PetalburgCity_House1_MapScripts:: @ 8207799 .byte 0 PetalburgCity_House1_EventScript_20779A:: @ 820779A - msgbox PetalburgCity_House1_Text_2077AC, 2 + msgbox PetalburgCity_House1_Text_2077AC, MSGBOX_NPC end PetalburgCity_House1_EventScript_2077A3:: @ 82077A3 - msgbox PetalburgCity_House1_Text_2077FB, 2 + msgbox PetalburgCity_House1_Text_2077FB, MSGBOX_NPC end PetalburgCity_House1_Text_2077AC: @ 82077AC diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc index 44987b3d6..2650e970c 100644 --- a/data/maps/PetalburgCity_House2/scripts.inc +++ b/data/maps/PetalburgCity_House2/scripts.inc @@ -2,15 +2,15 @@ PetalburgCity_House2_MapScripts:: @ 82078F2 .byte 0 PetalburgCity_House2_EventScript_2078F3:: @ 82078F3 - msgbox PetalburgCity_House2_Text_207905, 2 + msgbox PetalburgCity_House2_Text_207905, MSGBOX_NPC end PetalburgCity_House2_EventScript_2078FC:: @ 82078FC - msgbox PetalburgCity_House2_Text_207969, 2 + msgbox PetalburgCity_House2_Text_207969, MSGBOX_NPC end PetalburgCity_House2_Text_207905: @ 8207905 - .string "NORMAN became our town’s new\n" + .string "NORMAN became our town's new\n" .string "GYM LEADER.\p" .string "I think he called his family over from\n" .string "somewhere far away.$" diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 665ad3bae..f6d975615 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -9,7 +9,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 checkflag FLAG_0x128 goto_eq PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,7 +32,7 @@ PetalburgCity_Mart_Pokemart_207D8C: @ 8207D8C PetalburgCity_Mart_EventScript_207DA6:: @ 8207DA6 pokemart PetalburgCity_Mart_Pokemart_207DB8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -56,15 +56,15 @@ PetalburgCity_Mart_Pokemart_207DB8: @ 8207DB8 end PetalburgCity_Mart_EventScript_207DD6:: @ 8207DD6 - msgbox PetalburgCity_Mart_Text_207DF1, 2 + msgbox PetalburgCity_Mart_Text_207DF1, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DDF:: @ 8207DDF - msgbox PetalburgCity_Mart_Text_207E60, 2 + msgbox PetalburgCity_Mart_Text_207E60, MSGBOX_NPC end PetalburgCity_Mart_EventScript_207DE8:: @ 8207DE8 - msgbox PetalburgCity_Mart_Text_207EB0, 2 + msgbox PetalburgCity_Mart_Text_207EB0, MSGBOX_NPC end PetalburgCity_Mart_Text_207DF1: @ 8207DF1 @@ -75,8 +75,8 @@ PetalburgCity_Mart_Text_207DF1: @ 8207DF1 PetalburgCity_Mart_Text_207E60: @ 8207E60 .string "Do you use REPEL?\n" - .string "It keeps POKéMON away, so it’s\l" - .string "useful when you’re in a hurry.$" + .string "It keeps POKéMON away, so it's\l" + .string "useful when you're in a hurry.$" PetalburgCity_Mart_Text_207EB0: @ 8207EB0 .string "Do you have any ANTIDOTES with\n" diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 130a43de9..eb0150c08 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -17,17 +17,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_2079FC:: @ 82079FC end PetalburgCity_PokemonCenter_1F_EventScript_207A0A:: @ 8207A0A - msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207A76, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A13:: @ 8207A13 - msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, 2 + msgbox PetalburgCity_PokemonCenter_1F_Text_207AD6, MSGBOX_NPC end PetalburgCity_PokemonCenter_1F_EventScript_207A1C:: @ 8207A1C lock faceplayer - msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207B09, MSGBOX_DEFAULT specialvar VAR_RESULT, IsStarterInParty compare VAR_RESULT, 1 goto_eq PetalburgCity_PokemonCenter_1F_EventScript_207A38 @@ -45,15 +45,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_207A38:: @ 8207A38 end PetalburgCity_PokemonCenter_1F_EventScript_207A5B:: @ 8207A5B - msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207BB0, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A64:: @ 8207A64 - msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207C35, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_EventScript_207A6D:: @ 8207A6D - msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, 4 + msgbox PetalburgCity_PokemonCenter_1F_Text_207CB7, MSGBOX_DEFAULT return PetalburgCity_PokemonCenter_1F_Text_207A76: @ 8207A76 @@ -76,23 +76,23 @@ PetalburgCity_PokemonCenter_1F_Text_207B09: @ 8207B09 PetalburgCity_PokemonCenter_1F_Text_207BB0: @ 8207BB0 .string "For example, your TREECKO\n" .string "is a GRASS type.\p" - .string "It’s strong against the WATER and\n" + .string "It's strong against the WATER and\n" .string "GROUND types.\p" - .string "But, it’s weak against FIRE-type\n" + .string "But, it's weak against FIRE-type\n" .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_207C35: @ 8207C35 .string "For example, your TORCHIC\n" .string "is a FIRE type.\p" - .string "It’s strong against the GRASS and\n" + .string "It's strong against the GRASS and\n" .string "BUG types.\p" - .string "But, it’s weak against WATER-type\n" + .string "But, it's weak against WATER-type\n" .string "POKéMON.$" PetalburgCity_PokemonCenter_1F_Text_207CB7: @ 8207CB7 .string "For example, your MUDKIP\n" .string "is a WATER type.\p" - .string "It’s strong against the FIRE type.\p" - .string "But, it’s weak against GRASS-type\n" + .string "It's strong against the FIRE type.\p" + .string "But, it's weak against GRASS-type\n" .string "and ELECTRIC-type POKéMON.$" diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index e64bd57b1..8ef530784 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -18,10 +18,10 @@ PetalburgCity_WallysHouse_MapScript2_204247: @ 8204247 PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 lockall - msgbox PetalburgCity_WallysHouse_Text_20446E, 4 + msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT giveitem_std ITEM_HM03 setflag FLAG_0x07A - msgbox PetalburgCity_WallysHouse_Text_20461A, 4 + msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT setvar VAR_0x4057, 5 releaseall end @@ -35,23 +35,23 @@ PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 goto_eq PetalburgCity_WallysHouse_EventScript_2042A2 checkflag FLAG_0x087 goto_eq PetalburgCity_WallysHouse_EventScript_2042B6 - msgbox PetalburgCity_WallysHouse_Text_2042DF, 4 + msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT setflag FLAG_0x087 release end PetalburgCity_WallysHouse_EventScript_2042A2:: @ 82042A2 - msgbox PetalburgCity_WallysHouse_Text_204661, 4 + msgbox PetalburgCity_WallysHouse_Text_204661, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042AC:: @ 82042AC - msgbox PetalburgCity_WallysHouse_Text_204698, 4 + msgbox PetalburgCity_WallysHouse_Text_204698, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 - msgbox PetalburgCity_WallysHouse_Text_20444D, 4 + msgbox PetalburgCity_WallysHouse_Text_20444D, MSGBOX_DEFAULT release end @@ -60,28 +60,28 @@ PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 faceplayer checkflag FLAG_0x07A goto_eq PetalburgCity_WallysHouse_EventScript_2042D5 - msgbox PetalburgCity_WallysHouse_Text_204732, 4 + msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_EventScript_2042D5:: @ 82042D5 - msgbox PetalburgCity_WallysHouse_Text_2047A7, 4 + msgbox PetalburgCity_WallysHouse_Text_2047A7, MSGBOX_DEFAULT release end PetalburgCity_WallysHouse_Text_2042DF: @ 82042DF - .string "You’re…\n" + .string "You're…\n" .string "Ah, you must be {PLAYER}{KUN}, right?\p" .string "Thank you for playing with WALLY a\n" .string "little while ago.\p" - .string "He’s been frail and sickly ever\n" + .string "He's been frail and sickly ever\n" .string "since he was a baby.\p" - .string "We’ve sent him to stay with my relatives\n" + .string "We've sent him to stay with my relatives\n" .string "in VERDANTURF TOWN for a while.\p" .string "The air is a lot cleaner there\n" .string "than it is here.\p" - .string "What’s that? Where’s WALLY?\n" - .string "He’s already left, our WALLY.\p" + .string "What's that? Where's WALLY?\n" + .string "He's already left, our WALLY.\p" .string "I wonder where he could have\n" .string "gotten by now?$" @@ -91,7 +91,7 @@ PetalburgCity_WallysHouse_Text_20444D: @ 820444D PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "{PLAYER}{KUN}! Please excuse us for\n" .string "dragging you here this way.\p" - .string "But our WALLY’s become very healthy\n" + .string "But our WALLY's become very healthy\n" .string "since he went to VERDANTURF TOWN.\p" .string "We owe it all to you!\p" .string "When WALLY left town, you helped\n" @@ -100,31 +100,31 @@ PetalburgCity_WallysHouse_Text_20446E: @ 820446E .string "happy.\p" .string "Actually, not just WALLY.\n" .string "It made me, his father, happy too.\p" - .string "Happy that he’s gained such a great\n" + .string "Happy that he's gained such a great\n" .string "friend as you.\p" - .string "This isn’t a bribe or anything, but\n" - .string "I’d really like you to have this.$" + .string "This isn't a bribe or anything, but\n" + .string "I'd really like you to have this.$" PetalburgCity_WallysHouse_Text_20461A: @ 820461A - .string "If your POKéMON can SURF, you’ll be\n" + .string "If your POKéMON can SURF, you'll be\n" .string "able to go to all sorts of places.$" PetalburgCity_WallysHouse_Text_204661: @ 8204661 - .string "WALLY’s coming home soon.\n" - .string "I’m looking forward to that.$" + .string "WALLY's coming home soon.\n" + .string "I'm looking forward to that.$" PetalburgCity_WallysHouse_Text_204698: @ 8204698 .string "Oh? You met WALLY in\n" .string "EVER GRANDE CITY?\p" - .string "Oh, {PLAYER}{KUN}, don’t be silly.\p" + .string "Oh, {PLAYER}{KUN}, don't be silly.\p" .string "He may have gotten healthy, but he\n" - .string "can’t go somewhere far away like\l" + .string "can't go somewhere far away like\l" .string "that all by himself.$" PetalburgCity_WallysHouse_Text_204732: @ 8204732 .string "WALLY was really happy when he told\n" .string "us that he caught a POKéMON.\p" - .string "It’s been ages since I’ve seen him\n" + .string "It's been ages since I've seen him\n" .string "smile like that.$" PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 @@ -133,7 +133,7 @@ PetalburgCity_WallysHouse_Text_2047A7: @ 82047A7 .string "But our WALLY left VERDANTURF TOWN\n" .string "without telling anyone.\p" .string "You know, WALLY is frail, but\n" - .string "he’s surprisingly strong-willed.\p" - .string "I’m sure that he’ll come back safe\n" + .string "he's surprisingly strong-willed.\p" + .string "I'm sure that he'll come back safe\n" .string "and sound one day!$" diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 7c9a1ae49..387955f73 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -6,27 +6,27 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7 call PetalburgWoods_EventScript_22E124 applymovement 4, PetalburgWoods_Movement_22E1CB waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1F6 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1E4 waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E20E waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -43,26 +43,26 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 waitmovement 0 applymovement 255, PetalburgWoods_Movement_2725A4 waitmovement 0 - msgbox PetalburgWoods_Text_22E34F, 4 + msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 applymovement 3, PetalburgWoods_Movement_22E209 waitmovement 0 - msgbox PetalburgWoods_Text_22E3AA, 4 + msgbox PetalburgWoods_Text_22E3AA, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E205 waitmovement 0 applymovement 4, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E428, 4 + msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT closemessage applymovement 4, PetalburgWoods_Movement_22E1EA waitmovement 0 - msgbox PetalburgWoods_Text_22E457, 4 + msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT applymovement 255, PetalburgWoods_Movement_2725A6 waitmovement 0 - msgbox PetalburgWoods_Text_22E4A5, 4 - trainerbattle 3, TRAINER_GRUNT_8, 0, PetalburgWoods_Text_22E542 + msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 applymovement 3, PetalburgWoods_Movement_22E1F9 waitmovement 0 call PetalburgWoods_EventScript_22E138 @@ -75,19 +75,19 @@ PetalburgWoods_EventScript_22E079:: @ 822E079 PetalburgWoods_EventScript_22E124:: @ 822E124 applymovement 4, PetalburgWoods_Movement_22E1B1 waitmovement 0 - msgbox PetalburgWoods_Text_22E332, 4 + msgbox PetalburgWoods_Text_22E332, MSGBOX_DEFAULT closemessage return PetalburgWoods_EventScript_22E138:: @ 822E138 - msgbox PetalburgWoods_Text_22E563, 4 + msgbox PetalburgWoods_Text_22E563, MSGBOX_DEFAULT closemessage applymovement 3, PetalburgWoods_Movement_22E1FD waitmovement 0 removeobject 3 applymovement 255, PetalburgWoods_Movement_2725AA waitmovement 0 - msgbox PetalburgWoods_Text_22E63D, 4 + msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E17D @@ -95,15 +95,15 @@ PetalburgWoods_EventScript_22E138:: @ 822E138 end PetalburgWoods_EventScript_22E17D:: @ 822E17D - msgbox PetalburgWoods_Text_22E741, 4 + msgbox PetalburgWoods_Text_22E741, MSGBOX_DEFAULT goto PetalburgWoods_EventScript_22E18B end PetalburgWoods_EventScript_22E18B:: @ 822E18B - msgbox PetalburgWoods_Text_22E6C7, 4 + msgbox PetalburgWoods_Text_22E6C7, MSGBOX_DEFAULT applymovement 4, PetalburgWoods_Movement_22E1EE waitmovement 0 - msgbox PetalburgWoods_Text_22E712, 4 + msgbox PetalburgWoods_Text_22E712, MSGBOX_DEFAULT closemessage return @@ -239,11 +239,11 @@ PetalburgWoods_Movement_22E20E: @ 822E20E step_end PetalburgWoods_EventScript_22E210:: @ 822E210 - msgbox PetalburgWoods_Text_22EA0C, 2 + msgbox PetalburgWoods_Text_22EA0C, MSGBOX_NPC end PetalburgWoods_EventScript_22E219:: @ 822E219 - msgbox PetalburgWoods_Text_22EA8B, 2 + msgbox PetalburgWoods_Text_22EA8B, MSGBOX_NPC end PetalburgWoods_EventScript_22E222:: @ 822E222 @@ -251,7 +251,7 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 faceplayer checkflag FLAG_0x129 goto_eq PetalburgWoods_EventScript_22E251 - msgbox PetalburgWoods_Text_22EAFE, 4 + msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_272054 @@ -260,25 +260,25 @@ PetalburgWoods_EventScript_22E222:: @ 822E222 end PetalburgWoods_EventScript_22E251:: @ 822E251 - msgbox PetalburgWoods_Text_22EB63, 4 + msgbox PetalburgWoods_Text_22EB63, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E25B:: @ 822E25B - msgbox PetalburgWoods_Text_22EC10, 3 + msgbox PetalburgWoods_Text_22EC10, MSGBOX_SIGN end PetalburgWoods_EventScript_22E264:: @ 822E264 - msgbox PetalburgWoods_Text_22ED07, 3 + msgbox PetalburgWoods_Text_22ED07, MSGBOX_SIGN end PetalburgWoods_EventScript_22E26D:: @ 822E26D - trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 - msgbox PetalburgWoods_Text_22E7EF, 6 + trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_22E77D, PetalburgWoods_Text_22E7C1 + msgbox PetalburgWoods_Text_22E7EF, MSGBOX_AUTOCLOSE end PetalburgWoods_EventScript_22E284:: @ 822E284 - trainerbattle 2, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 + trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_22E827, PetalburgWoods_Text_22E86B, PetalburgWoods_EventScript_22E2C5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq PetalburgWoods_EventScript_22E31B @@ -286,7 +286,7 @@ PetalburgWoods_EventScript_22E284:: @ 822E284 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq PetalburgWoods_EventScript_22E2EF - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end @@ -299,33 +299,27 @@ PetalburgWoods_EventScript_22E2C5:: @ 822E2C5 end PetalburgWoods_EventScript_22E2D6:: @ 822E2D6 - msgbox PetalburgWoods_Text_22E8C3, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 + msgbox PetalburgWoods_Text_22E8C3, MSGBOX_DEFAULT + register_matchcall TRAINER_JAMES_1 release end PetalburgWoods_EventScript_22E2EF:: @ 822E2EF checkflag FLAG_HAS_MATCH_CALL goto_eq PetalburgWoods_EventScript_22E302 - msgbox PetalburgWoods_Text_22E889, 4 + msgbox PetalburgWoods_Text_22E889, MSGBOX_DEFAULT release end PetalburgWoods_EventScript_22E302:: @ 822E302 - msgbox PetalburgWoods_Text_22E914, 4 - setvar VAR_0x8004, 621 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 621 - callstd 8 + msgbox PetalburgWoods_Text_22E914, MSGBOX_DEFAULT + register_matchcall TRAINER_JAMES_1 release end PetalburgWoods_EventScript_22E31B:: @ 822E31B - trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 - msgbox PetalburgWoods_Text_22E9B6, 6 + trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_22E966, PetalburgWoods_Text_22E998 + msgbox PetalburgWoods_Text_22E9B6, MSGBOX_AUTOCLOSE end PetalburgWoods_Text_22E332: @ 822E332 @@ -340,7 +334,7 @@ PetalburgWoods_Text_22E34F: @ 822E34F PetalburgWoods_Text_22E3AA: @ 822E3AA .string "I was going to ambush you, but you\n" .string "had to dawdle in PETALBURG WOODS\l" - .string "forever, didn’t you?\p" + .string "forever, didn't you?\p" .string "I got sick of waiting, so here I am!$" PetalburgWoods_Text_22E428: @ 822E428 @@ -349,49 +343,49 @@ PetalburgWoods_Text_22E428: @ 822E428 PetalburgWoods_Text_22E457: @ 822E457 .string "Aiyeeeh!\p" - .string "You’re a POKéMON TRAINER, aren’t you?\n" - .string "You’ve got to help me, please!$" + .string "You're a POKéMON TRAINER, aren't you?\n" + .string "You've got to help me, please!$" PetalburgWoods_Text_22E4A5: @ 822E4A5 - .string "Hunh? What do you think you’re doing?\n" - .string "What, you’re going to protect him?\p" + .string "Hunh? What do you think you're doing?\n" + .string "What, you're going to protect him?\p" .string "No one who crosses TEAM AQUA\n" .string "gets any mercy, not even a kid!\p" .string "Come on and battle me!$" PetalburgWoods_Text_22E542: @ 822E542 - .string "You’re kidding me! You’re tough!$" + .string "You're kidding me! You're tough!$" PetalburgWoods_Text_22E563: @ 822E563 - .string "Grrr… You’ve got some nerve\n" + .string "Grrr… You've got some nerve\n" .string "meddling with TEAM AQUA!\l" .string "Come on and battle me again!\p" - .string "I wish I could say that, but I’m out of\n" + .string "I wish I could say that, but I'm out of\n" .string "POKéMON…\p" .string "And, hey, we of TEAM AQUA are also\n" .string "after something in RUSTBORO.\p" - .string "I’ll let you go today!$" + .string "I'll let you go today!$" PetalburgWoods_Text_22E63D: @ 822E63D .string "Whew…\n" .string "That was awfully close!\p" - .string "Thanks to you, he didn’t rob me of\n" + .string "Thanks to you, he didn't rob me of\n" .string "these important papers.\p" - .string "I know, I’ll give you a GREAT BALL as\n" + .string "I know, I'll give you a GREAT BALL as\n" .string "my thanks!$" PetalburgWoods_Text_22E6C7: @ 822E6C7 - .string "Didn’t that TEAM AQUA thug say\n" + .string "Didn't that TEAM AQUA thug say\n" .string "they were after something in\l" .string "RUSTBORO, too?$" PetalburgWoods_Text_22E712: @ 822E712 - .string "Uh-oh! It’s a crisis!\n" - .string "I can’t be wasting time!$" + .string "Uh-oh! It's a crisis!\n" + .string "I can't be wasting time!$" PetalburgWoods_Text_22E741: @ 822E741 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" + .string "You're loaded with items.\n" + .string "I can't give you this GREAT BALL.$" PetalburgWoods_Text_22E77D: @ 822E77D .string "I caught a whole bunch of POKéMON!\p" @@ -400,18 +394,18 @@ PetalburgWoods_Text_22E77D: @ 822E77D PetalburgWoods_Text_22E7C1: @ 822E7C1 .string "I have all these POKéMON,\n" - .string "but I couldn’t win…$" + .string "but I couldn't win…$" PetalburgWoods_Text_22E7EF: @ 822E7EF .string "I caught a bunch of POKéMON.\n" - .string "Now I’m out of POKé BALLS.$" + .string "Now I'm out of POKé BALLS.$" PetalburgWoods_Text_22E827: @ 822E827 .string "If you take BUG POKéMON to school,\n" .string "you get to be instantly popular!$" PetalburgWoods_Text_22E86B: @ 822E86B - .string "I can’t be popular if I lose.$" + .string "I can't be popular if I lose.$" PetalburgWoods_Text_22E889: @ 822E889 .string "If you have a big BUG POKéMON,\n" @@ -420,24 +414,24 @@ PetalburgWoods_Text_22E889: @ 822E889 PetalburgWoods_Text_22E8C3: @ 822E8C3 .string "I want a rematch when my BUG\n" .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" + .string "I'm registering you in my POKéNAV!$" PetalburgWoods_Text_22E914: @ 822E914 .string "I want a rematch when my BUG \n" .string "POKéMON grow up!\p" - .string "I’m registering you in my POKéNAV!$" + .string "I'm registering you in my POKéNAV!$" PetalburgWoods_Text_22E966: @ 822E966 .string "My BUG POKéMON have grown.\n" - .string "I’ll be popular again.$" + .string "I'll be popular again.$" PetalburgWoods_Text_22E998: @ 822E998 - .string "I can’t be popular if I lose.$" + .string "I can't be popular if I lose.$" PetalburgWoods_Text_22E9B6: @ 822E9B6 .string "You get to be popular if you have\n" .string "strong POKéMON, right?\l" - .string "So, I’ve been training hard.$" + .string "So, I've been training hard.$" PetalburgWoods_Text_22EA0C: @ 822EA0C .string "Yo, there!\n" @@ -448,18 +442,18 @@ PetalburgWoods_Text_22EA0C: @ 822EA0C PetalburgWoods_Text_22EA8B: @ 822EA8B .string "Sometimes, there are things on the\n" - .string "ground even if you can’t see them.\p" - .string "That’s why I always check where I’m\n" + .string "ground even if you can't see them.\p" + .string "That's why I always check where I'm\n" .string "walking.$" PetalburgWoods_Text_22EAFE: @ 822EAFE .string "Oh, neat!\n" - .string "That’s the BADGE from RUSTBORO GYM!\p" + .string "That's the BADGE from RUSTBORO GYM!\p" .string "You must be a TRAINER.\n" .string "You should try using this item.$" PetalburgWoods_Text_22EB63: @ 822EB63 - .string "It’s a MIRACLE SEED.\n" + .string "It's a MIRACLE SEED.\n" .string "If a POKéMON holds that item, its\l" .string "GRASS-type moves become stronger.\p" .string "Besides MIRACLE SEED, I think there are\n" diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 7cc7d522f..f724914ba 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -19,7 +19,7 @@ Route101_EventScript_1EBCD5:: @ 81EBCD5 Route101_EventScript_1EBCDE:: @ 81EBCDE lockall playbgm MUS_EVENT0, 1 - msgbox Route101_Text_1EBE8F, 4 + msgbox Route101_Text_1EBE8F, MSGBOX_DEFAULT closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 @@ -35,7 +35,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE applymovement 4, Route101_Movement_1EBDBD applymovement 2, Route101_Movement_1EBDEF waitmovement 0 - msgbox Route101_Text_1EBE9A, 4 + msgbox Route101_Text_1EBE9A, MSGBOX_DEFAULT closemessage setvar VAR_0x4060, 2 releaseall @@ -43,7 +43,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE Route101_EventScript_1EBD4E:: @ 81EBD4E lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD90 waitmovement 0 @@ -52,7 +52,7 @@ Route101_EventScript_1EBD4E:: @ 81EBD4E Route101_EventScript_1EBD64:: @ 81EBD64 lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD92 waitmovement 0 @@ -61,7 +61,7 @@ Route101_EventScript_1EBD64:: @ 81EBD64 Route101_EventScript_1EBD7A:: @ 81EBD7A lockall - msgbox Route101_Text_1EBEDF, 4 + msgbox Route101_Text_1EBEDF, MSGBOX_DEFAULT closemessage applymovement 255, Route101_Movement_1EBD94 waitmovement 0 @@ -204,15 +204,15 @@ Route101_Movement_1EBDF7: @ 81EBDF7 step_end Route101_EventScript_1EBDFB:: @ 81EBDFB - msgbox Route101_Text_1EBFDD, 2 + msgbox Route101_Text_1EBFDD, MSGBOX_NPC end Route101_EventScript_1EBE04:: @ 81EBE04 - msgbox Route101_Text_1EC04A, 2 + msgbox Route101_Text_1EC04A, MSGBOX_NPC end Route101_EventScript_1EBE0D:: @ 81EBE0D - msgbox Route101_Text_1EC0C8, 3 + msgbox Route101_Text_1EC0C8, MSGBOX_SIGN end Route101_EventScript_1EBE16:: @ 81EBE16 @@ -229,7 +229,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 waitstate applymovement 2, Route101_Movement_1EBE8D waitmovement 0 - msgbox Route101_Text_1EBF12, 4 + msgbox Route101_Text_1EBF12, MSGBOX_DEFAULT special HealPlayerParty setflag FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH @@ -266,11 +266,11 @@ Route101_Text_1EBE9A: @ 81EBE9A .string "Hello! You over there!\n" .string "Please! Help!\p" .string "In my BAG!\n" - .string "There’s a POKé BALL!$" + .string "There's a POKé BALL!$" Route101_Text_1EBEDF: @ 81EBEDF .string "Wh-Where are you going?!\n" - .string "Don’t leave me like this!$" + .string "Don't leave me like this!$" Route101_Text_1EBF12: @ 81EBF12 .string "PROF. BIRCH: Whew…\p" @@ -279,14 +279,14 @@ Route101_Text_1EBF12: @ 81EBF12 .string "You saved me.\n" .string "Thanks a lot!\p" .string "Oh?\p" - .string "Hi, you’re {PLAYER}{KUN}!\p" + .string "Hi, you're {PLAYER}{KUN}!\p" .string "This is not the place to chat, so come\n" .string "by my POKéMON LAB later, okay?$" Route101_Text_1EBFDD: @ 81EBFDD .string "If POKéMON get tired, take them to\n" .string "a POKéMON CENTER.\p" - .string "There’s a POKéMON CENTER in OLDALE\n" + .string "There's a POKéMON CENTER in OLDALE\n" .string "TOWN right close by.$" Route101_Text_1EC04A: @ 81EC04A diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index d25794242..0a2ba36ba 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -2,23 +2,23 @@ Route102_MapScripts:: @ 81EC0E0 .byte 0 Route102_EventScript_1EC0E1:: @ 81EC0E1 - msgbox Route102_Text_1EC2C0, 2 + msgbox Route102_Text_1EC2C0, MSGBOX_NPC end Route102_EventScript_1EC0EA:: @ 81EC0EA - msgbox Route102_Text_1EC35B, 3 + msgbox Route102_Text_1EC35B, MSGBOX_SIGN end Route102_EventScript_1EC0F3:: @ 81EC0F3 - msgbox Route102_Text_1EC373, 3 + msgbox Route102_Text_1EC373, MSGBOX_SIGN end Route102_EventScript_1EC0FC:: @ 81EC0FC - msgbox Route102_Text_1EC32E, 2 + msgbox Route102_Text_1EC32E, MSGBOX_NPC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -26,7 +26,7 @@ Route102_EventScript_1EC105:: @ 81EC105 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end @@ -39,75 +39,69 @@ Route102_EventScript_1EC146:: @ 81EC146 end Route102_EventScript_1EC157:: @ 81EC157 - msgbox Route102_Text_294668, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 + msgbox Route102_Text_294668, MSGBOX_DEFAULT + register_matchcall TRAINER_CALVIN_1 release end Route102_EventScript_1EC170:: @ 81EC170 checkflag FLAG_HAS_MATCH_CALL goto_eq Route102_EventScript_1EC183 - msgbox Route102_Text_2945AC, 4 + msgbox Route102_Text_2945AC, MSGBOX_DEFAULT release end Route102_EventScript_1EC183:: @ 81EC183 - msgbox Route102_Text_2945EB, 4 - setvar VAR_0x8004, 318 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 318 - callstd 8 + msgbox Route102_Text_2945EB, MSGBOX_DEFAULT + register_matchcall TRAINER_CALVIN_1 release end Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C - msgbox Route102_Text_29473C, 6 + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C + msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 - msgbox Route102_Text_294859, 6 + trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 + msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 - msgbox Route102_Text_294916, 6 + trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 + msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA - msgbox Route102_Text_2947DB, 6 + trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA + msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end PetalburgCity_Text_1EC1F8: @ 81EC1F8 .string "WALLY: {PLAYER}…\n" .string "POKéMON hide in tall grass like this,\l" - .string "don’t they?\p" + .string "don't they?\p" .string "Please watch me and see if I can\n" .string "catch one properly.\p" .string "…Whoa!$" PetalburgCity_Text_1EC271: @ 81EC271 - .string "WALLY: I did it… It’s my…\n" + .string "WALLY: I did it… It's my…\n" .string "My POKéMON!$" PetalburgCity_Text_1EC297: @ 81EC297 .string "{PLAYER}, thank you!\n" - .string "Let’s go back to the GYM!$" + .string "Let's go back to the GYM!$" Route102_Text_1EC2C0: @ 81EC2C0 - .string "I’m…not very tall, so I sink right\n" + .string "I'm…not very tall, so I sink right\n" .string "into tall grass.\p" .string "The grass goes up my nose and…\n" .string "Fwafwafwafwafwa…\p" .string "Fwatchoo!$" Route102_Text_1EC32E: @ 81EC32E - .string "I’m going to catch a whole bunch of\n" + .string "I'm going to catch a whole bunch of\n" .string "POKéMON!$" Route102_Text_1EC35B: @ 81EC35B diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 57cde74e6..e79ddd041 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -28,7 +28,7 @@ Route103_EventScript_1EC3C1:: @ 81EC3C1 end Route103_EventScript_1EC3DA:: @ 81EC3DA - msgbox Route103_Text_1EC7A6, 4 + msgbox Route103_Text_1EC7A6, MSGBOX_DEFAULT closemessage playbgm MUS_GIRL_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -37,7 +37,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC7DE, 4 + msgbox Route103_Text_1EC7DE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC48E case 1, Route103_EventScript_1EC49E @@ -45,7 +45,7 @@ Route103_EventScript_1EC3DA:: @ 81EC3DA end Route103_EventScript_1EC434:: @ 81EC434 - msgbox Route103_Text_1EC989, 4 + msgbox Route103_Text_1EC989, MSGBOX_DEFAULT closemessage playbgm MUS_BOY_SUP, 1 applymovement 2, Route103_Movement_27259E @@ -54,7 +54,7 @@ Route103_EventScript_1EC434:: @ 81EC434 waitmovement 0 applymovement 2, Route103_Movement_27259A waitmovement 0 - msgbox Route103_Text_1EC9CE, 4 + msgbox Route103_Text_1EC9CE, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route103_EventScript_1EC4BE case 1, Route103_EventScript_1EC4CE @@ -62,42 +62,42 @@ Route103_EventScript_1EC434:: @ 81EC434 end Route103_EventScript_1EC48E:: @ 81EC48E - trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC49E:: @ 81EC49E - trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4AE:: @ 81EC4AE - trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_1EC881 + trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_1EC881 goto Route103_EventScript_1EC4EE end Route103_EventScript_1EC4BE:: @ 81EC4BE - trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4CE:: @ 81EC4CE - trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4DE:: @ 81EC4DE - trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_1ECA59 + trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_1ECA59 goto Route103_EventScript_1EC4FC end Route103_EventScript_1EC4EE:: @ 81EC4EE - msgbox Route103_Text_1EC8AE, 4 + msgbox Route103_Text_1EC8AE, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end Route103_EventScript_1EC4FC:: @ 81EC4FC - msgbox Route103_Text_1ECA79, 4 + msgbox Route103_Text_1ECA79, MSGBOX_DEFAULT goto Route103_EventScript_1EC50A end @@ -191,132 +191,123 @@ Route103_Movement_1EC5D6: @ 81EC5D6 step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 - msgbox Route103_Text_1ECB73, 2 + msgbox Route103_Text_1ECB73, MSGBOX_NPC end Route103_EventScript_1EC5E2:: @ 81EC5E2 - msgbox Route103_Text_1ECBB5, 2 + msgbox Route103_Text_1ECBB5, MSGBOX_NPC end Route103_EventScript_1EC5EB:: @ 81EC5EB - msgbox Route103_Text_1ECC1A, 3 + msgbox Route103_Text_1ECC1A, MSGBOX_SIGN end Route103_EventScript_1EC5F4:: @ 81EC5F4 - trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_29495A, Route103_Text_29498F - msgbox Route103_Text_2949B4, 6 + trainerbattle_single TRAINER_DAISY, Route103_Text_29495A, Route103_Text_29498F + msgbox Route103_Text_2949B4, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC60B:: @ 81EC60B - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_2949F9, Route103_Text_294A3D, Route103_Text_294AAE, Route103_EventScript_1EC63A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC653 - msgbox Route103_Text_294A52, 6 + msgbox Route103_Text_294A52, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC63A:: @ 81EC63A - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT + register_matchcall TRAINER_AMY_AND_LIV_1 release end Route103_EventScript_1EC653:: @ 81EC653 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF - msgbox Route103_Text_294C93, 6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294C29, Route103_Text_294C6D, Route103_Text_294CEF + msgbox Route103_Text_294C93, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC66E:: @ 81EC66E - trainerbattle 6, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D + trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_294AFD, Route103_Text_294B22, Route103_Text_294BD0, Route103_EventScript_1EC69D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC6B6 - msgbox Route103_Text_294B40, 6 + msgbox Route103_Text_294B40, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC69D:: @ 81EC69D - msgbox Route103_Text_294B8A, 4 - setvar VAR_0x8004, 481 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 481 - callstd 8 + msgbox Route103_Text_294B8A, MSGBOX_DEFAULT + register_matchcall TRAINER_AMY_AND_LIV_1 release end Route103_EventScript_1EC6B6:: @ 81EC6B6 - trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB - msgbox Route103_Text_294D89, 6 + trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_294D3E, Route103_Text_294D63, Route103_Text_294DDB + msgbox Route103_Text_294D89, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6D1:: @ 81EC6D1 - trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_294E34, Route103_Text_294E92 - msgbox Route103_Text_294EBB, 6 + trainerbattle_single TRAINER_ANDREW, Route103_Text_294E34, Route103_Text_294E92 + msgbox Route103_Text_294EBB, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC6E8:: @ 81EC6E8 - trainerbattle 2, TRAINER_MIGUEL_1, 0, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 + trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_294EDF, Route103_Text_294F21, Route103_EventScript_1EC714 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route103_EventScript_1EC733 - msgbox Route103_Text_294F42, 4 + msgbox Route103_Text_294F42, MSGBOX_DEFAULT release end Route103_EventScript_1EC714:: @ 81EC714 special sub_80B4808 waitmovement 0 - msgbox Route103_Text_294F7E, 4 - setvar VAR_0x8004, 293 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 293 - callstd 8 + msgbox Route103_Text_294F7E, MSGBOX_DEFAULT + register_matchcall TRAINER_MIGUEL_1 release end Route103_EventScript_1EC733:: @ 81EC733 - trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_294FC3, Route103_Text_295006 - msgbox Route103_Text_29501E, 6 + trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_294FC3, Route103_Text_295006 + msgbox Route103_Text_29501E, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC74A:: @ 81EC74A - trainerbattle 0, TRAINER_MARCOS, 0, Route103_Text_295206, Route103_Text_29522B - msgbox Route103_Text_295246, 6 + trainerbattle_single TRAINER_MARCOS, Route103_Text_295206, Route103_Text_29522B + msgbox Route103_Text_295246, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC761:: @ 81EC761 - trainerbattle 0, TRAINER_RHETT, 0, Route103_Text_295199, Route103_Text_2951C6 - msgbox Route103_Text_2951DE, 6 + trainerbattle_single TRAINER_RHETT, Route103_Text_295199, Route103_Text_2951C6 + msgbox Route103_Text_2951DE, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC778:: @ 81EC778 - trainerbattle 0, TRAINER_PETE, 0, Route103_Text_295063, Route103_Text_295093 - msgbox Route103_Text_2950AA, 6 + trainerbattle_single TRAINER_PETE, Route103_Text_295063, Route103_Text_295093 + msgbox Route103_Text_2950AA, MSGBOX_AUTOCLOSE end Route103_EventScript_1EC78F:: @ 81EC78F - trainerbattle 0, TRAINER_ISABELLE, 0, Route103_Text_295116, Route103_Text_295146 - msgbox Route103_Text_29514D, 6 + trainerbattle_single TRAINER_ISABELLE, Route103_Text_295116, Route103_Text_295146 + msgbox Route103_Text_29514D, MSGBOX_AUTOCLOSE end Route103_Text_1EC7A6: @ 81EC7A6 - .string "MAY: Let’s see… The POKéMON found\n" + .string "MAY: Let's see… The POKéMON found\n" .string "on ROUTE 103 include…$" Route103_Text_1EC7DE: @ 81EC7DE .string "Oh, hi, {PLAYER}{KUN}!\p" .string "…Oh, I see, my dad gave you\n" .string "a POKéMON as a gift.\p" - .string "Since we’re here, let’s have a quick\n" + .string "Since we're here, let's have a quick\n" .string "battle!\p" - .string "I’ll give you a taste of what being\n" + .string "I'll give you a taste of what being\n" .string "a TRAINER is like.$" Route103_Text_1EC881: @ 81EC881 - .string "Wow! That’s great!\n" - .string "{PLAYER}{KUN}, you’re pretty good!$" + .string "Wow! That's great!\n" + .string "{PLAYER}{KUN}, you're pretty good!$" Route103_Text_1EC8AE: @ 81EC8AE .string "MAY: I think I know why my dad has\n" @@ -325,23 +316,23 @@ Route103_Text_1EC8AE: @ 81EC8AE .string "but it already likes you.\p" .string "You might be able to befriend any\n" .string "kind of POKéMON easily.\p" - .string "Well, it’s time to head back to\n" + .string "Well, it's time to head back to\n" .string "the LAB.$" Route103_Text_1EC989: @ 81EC989 - .string "BRENDAN: Okay, so it’s this one and\n" + .string "BRENDAN: Okay, so it's this one and\n" .string "that one that live on ROUTE 103…$" Route103_Text_1EC9CE: @ 81EC9CE - .string "Hey, it’s {PLAYER}!\p" + .string "Hey, it's {PLAYER}!\p" .string "…Oh, yeah, Dad gave you a POKéMON.\p" - .string "Since we’re here, how about a little\n" + .string "Since we're here, how about a little\n" .string "battle?\p" - .string "I’ll teach you what being a TRAINER’s\n" + .string "I'll teach you what being a TRAINER's\n" .string "about!$" Route103_Text_1ECA59: @ 81ECA59 - .string "Huh, {PLAYER}, you’re not too shabby.$" + .string "Huh, {PLAYER}, you're not too shabby.$" Route103_Text_1ECA79: @ 81ECA79 .string "BRENDAN: I think I get it.\n" @@ -359,8 +350,8 @@ Route103_Text_1ECB73: @ 81ECB73 Route103_Text_1ECBB5: @ 81ECBB5 .string "If you cross the sea from here,\n" - .string "it’ll be a shortcut to OLDALE TOWN.\p" - .string "Fufufu, that’s useful, isn’t it?$" + .string "it'll be a shortcut to OLDALE TOWN.\p" + .string "Fufufu, that's useful, isn't it?$" Route103_Text_1ECC1A: @ 81ECC1A .string "ROUTE 103\n" diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index a37c89469..1d591793d 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -104,27 +104,27 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECDD0 setflag FLAG_0x07C - msgbox Route104_Text_1EDBFF, 4 + msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDC8F, 4 + msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDCB1, 4 + msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EDCED, 5 + msgbox Route104_Text_1EDCED, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end @@ -144,15 +144,15 @@ Route104_Movement_1ECDCD: @ 81ECDCD step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 - msgbox Route104_Text_1EDD9F, 5 + msgbox Route104_Text_1EDD9F, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, 4 + msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECDED:: @ 81ECDED - msgbox Route104_Text_1EDDDB, 4 + msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECE36 case 1, Route104_EventScript_1ECE49 @@ -160,7 +160,7 @@ Route104_EventScript_1ECDED:: @ 81ECDED end Route104_EventScript_1ECE1C:: @ 81ECE1C - msgbox Route104_Text_1EDE3E, 4 + msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall @@ -172,19 +172,19 @@ Route104_EventScript_1ECE31:: @ 81ECE31 return Route104_EventScript_1ECE36:: @ 81ECE36 - trainerbattle 3, TRAINER_MAY_14, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE49:: @ 81ECE49 - trainerbattle 3, TRAINER_MAY_15, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE5C:: @ 81ECE5C - trainerbattle 3, TRAINER_MAY_10, 0, Route104_Text_1EDE18 + trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18 setflag FLAG_0x07D goto Route104_EventScript_1ECE1C end @@ -195,41 +195,41 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F checkflag FLAG_0x07C goto_eq Route104_EventScript_1ECEEC setflag FLAG_0x07C - msgbox Route104_Text_1EDF04, 4 + msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDFA0, 4 + msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD applymovement 255, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDFC6, 4 + msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT closemessage waitmovement 0 applymovement 34, Route104_Movement_1ECDCA waitmovement 0 moveobjectoffscreen 34 - msgbox Route104_Text_1EE009, 5 + msgbox Route104_Text_1EE009, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT call Route104_EventScript_1ECE31 releaseall end Route104_EventScript_1ECEEC:: @ 81ECEEC - msgbox Route104_Text_1EE094, 5 + msgbox Route104_Text_1EE094, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, 4 + msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ECF09:: @ 81ECF09 - msgbox Route104_Text_1EE0C7, 4 + msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route104_EventScript_1ECF4D case 1, Route104_EventScript_1ECF60 @@ -237,26 +237,26 @@ Route104_EventScript_1ECF09:: @ 81ECF09 end Route104_EventScript_1ECF38:: @ 81ECF38 - msgbox Route104_Text_1EE120, 4 + msgbox Route104_Text_1EE120, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, Route104_EventScript_1ECE31 releaseall end Route104_EventScript_1ECF4D:: @ 81ECF4D - trainerbattle 3, TRAINER_BRENDAN_10, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF60:: @ 81ECF60 - trainerbattle 3, TRAINER_BRENDAN_12, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF73:: @ 81ECF73 - trainerbattle 3, TRAINER_BRENDAN_11, 0, Route104_Text_1EE107 + trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107 setflag FLAG_0x07D goto Route104_EventScript_1ECF38 end @@ -276,17 +276,17 @@ Route104_EventScript_1ECF8C:: @ 81ECF8C faceplayer checkflag FLAG_0x0F6 goto_eq Route104_EventScript_1ECFC3 - msgbox Route104_Text_2A6D86, 4 + msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 setflag FLAG_0x0F6 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end Route104_EventScript_1ECFC3:: @ 81ECFC3 - msgbox Route104_Text_2A6E32, 4 + msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD faceplayer checkflag FLAG_0x117 goto_eq Route104_EventScript_1ECFFC - msgbox Route104_Text_1ED96A, 4 + msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -304,44 +304,44 @@ Route104_EventScript_1ECFCD:: @ 81ECFCD end Route104_EventScript_1ECFFC:: @ 81ECFFC - msgbox Route104_Text_1EDA0F, 4 + msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT release end Route104_EventScript_1ED006:: @ 81ED006 - msgbox Route104_Text_1ED5EC, 2 + msgbox Route104_Text_1ED5EC, MSGBOX_NPC end Route104_EventScript_1ED00F:: @ 81ED00F - msgbox Route104_Text_1ED662, 3 + msgbox Route104_Text_1ED662, MSGBOX_SIGN end Route104_EventScript_1ED018:: @ 81ED018 - msgbox Route104_Text_1EDA8C, 3 + msgbox Route104_Text_1EDA8C, MSGBOX_SIGN end Route104_EventScript_1ED021:: @ 81ED021 - msgbox Route104_Text_1EDAA1, 3 + msgbox Route104_Text_1EDAA1, MSGBOX_SIGN end Route104_EventScript_1ED02A:: @ 81ED02A - msgbox Route104_Text_1EDABC, 3 + msgbox Route104_Text_1EDABC, MSGBOX_SIGN end Route104_EventScript_1ED033:: @ 81ED033 - msgbox Route104_Text_1EDAD6, 3 + msgbox Route104_Text_1EDAD6, MSGBOX_SIGN end Route104_EventScript_1ED03C:: @ 81ED03C - msgbox Route104_Text_1EDAEF, 3 + msgbox Route104_Text_1EDAEF, MSGBOX_SIGN end Route104_EventScript_1ED045:: @ 81ED045 - msgbox Route104_Text_1ED6A2, 2 + msgbox Route104_Text_1ED6A2, MSGBOX_NPC end Route104_EventScript_1ED04E:: @ 81ED04E - msgbox Route104_Text_1ED735, 2 + msgbox Route104_Text_1ED735, MSGBOX_NPC end Route104_EventScript_1ED057:: @ 81ED057 @@ -349,7 +349,7 @@ Route104_EventScript_1ED057:: @ 81ED057 faceplayer checkflag FLAG_0x106 goto_eq Route104_EventScript_1ED086 - msgbox Route104_Text_1ED838, 4 + msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 goto_eq Route104_EventScript_272054 @@ -358,12 +358,12 @@ Route104_EventScript_1ED057:: @ 81ED057 end Route104_EventScript_1ED086:: @ 81ED086 - msgbox Route104_Text_1ED8E7, 4 + msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT release end Route104_EventScript_1ED090:: @ 81ED090 - msgbox Route104_Text_1ED7A2, 2 + msgbox Route104_Text_1ED7A2, MSGBOX_NPC end Route104_EventScript_1ED099:: @ 81ED099 @@ -396,7 +396,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EE463, 4 + msgbox Route104_Text_1EE463, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -438,12 +438,12 @@ Route104_EventScript_1ED139:: @ 81ED139 end Route104_EventScript_1ED1B4:: @ 81ED1B4 - msgbox Route104_Text_1E9AAF, 4 + msgbox Route104_Text_1E9AAF, MSGBOX_DEFAULT releaseall end Route104_EventScript_1ED1BE:: @ 81ED1BE - msgbox Route104_Text_1E9C1D, 4 + msgbox Route104_Text_1E9C1D, MSGBOX_DEFAULT releaseall end @@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C step_end Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_2954BD, Route104_Text_295509 - msgbox Route104_Text_29554E, 6 + trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 + msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_29558A, Route104_Text_2955B4 - msgbox Route104_Text_2955E8, 6 + trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 + msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle 2, TRAINER_HALEY_1, 0, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 @@ -889,7 +889,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED3F8 - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end @@ -902,37 +902,31 @@ Route104_EventScript_1ED3CE:: @ 81ED3CE end Route104_EventScript_1ED3DF:: @ 81ED3DF - msgbox Route104_Text_29576B, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 + msgbox Route104_Text_29576B, MSGBOX_DEFAULT + register_matchcall TRAINER_HALEY_1 release end Route104_EventScript_1ED3F8:: @ 81ED3F8 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED40B - msgbox Route104_Text_295689, 4 + msgbox Route104_Text_295689, MSGBOX_DEFAULT release end Route104_EventScript_1ED40B:: @ 81ED40B - msgbox Route104_Text_2956FF, 4 - setvar VAR_0x8004, 604 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 604 - callstd 8 + msgbox Route104_Text_2956FF, MSGBOX_DEFAULT + register_matchcall TRAINER_HALEY_1 release end Route104_EventScript_1ED424:: @ 81ED424 - trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_2957D7, Route104_Text_2957F0 - msgbox Route104_Text_29580C, 6 + trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0 + msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle 2, TRAINER_WINSTON_1, 0, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 @@ -940,7 +934,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED4A6 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end @@ -953,37 +947,31 @@ Route104_EventScript_1ED47C:: @ 81ED47C end Route104_EventScript_1ED48D:: @ 81ED48D - msgbox Route104_Text_29595A, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 + msgbox Route104_Text_29595A, MSGBOX_DEFAULT + register_matchcall TRAINER_WINSTON_1 release end Route104_EventScript_1ED4A6:: @ 81ED4A6 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED4B9 - msgbox Route104_Text_2958C1, 4 + msgbox Route104_Text_2958C1, MSGBOX_DEFAULT release end Route104_EventScript_1ED4B9:: @ 81ED4B9 - msgbox Route104_Text_2958F8, 4 - setvar VAR_0x8004, 136 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 136 - callstd 8 + msgbox Route104_Text_2958F8, MSGBOX_DEFAULT + register_matchcall TRAINER_WINSTON_1 release end Route104_EventScript_1ED4D2:: @ 81ED4D2 - trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_2959BC, Route104_Text_2959FC - msgbox Route104_Text_295A1E, 6 + trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC + msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle 2, TRAINER_CINDY_1, 0, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 @@ -991,7 +979,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route104_EventScript_1ED554 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end @@ -1004,52 +992,46 @@ Route104_EventScript_1ED52A:: @ 81ED52A end Route104_EventScript_1ED53B:: @ 81ED53B - msgbox Route104_Text_295B60, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 + msgbox Route104_Text_295B60, MSGBOX_DEFAULT + register_matchcall TRAINER_CINDY_1 release end Route104_EventScript_1ED554:: @ 81ED554 checkflag FLAG_HAS_MATCH_CALL goto_eq Route104_EventScript_1ED567 - msgbox Route104_Text_295AC3, 4 + msgbox Route104_Text_295AC3, MSGBOX_DEFAULT release end Route104_EventScript_1ED567:: @ 81ED567 - msgbox Route104_Text_295B01, 4 - setvar VAR_0x8004, 114 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 114 - callstd 8 + msgbox Route104_Text_295B01, MSGBOX_DEFAULT + register_matchcall TRAINER_CINDY_1 release end Route104_EventScript_1ED580:: @ 81ED580 - trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_295BC8, Route104_Text_295BFA - msgbox Route104_Text_295C1F, 6 + trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA + msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED597:: @ 81ED597 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 special GetPlayerBigGuyGirlString - msgbox Route104_Text_2952FE, 4 + msgbox Route104_Text_2952FE, MSGBOX_DEFAULT release end Route104_EventScript_1ED5B6:: @ 81ED5B6 - trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 special GetPlayerBigGuyGirlString - msgbox Route104_Text_29540D, 4 + msgbox Route104_Text_29540D, MSGBOX_DEFAULT release end Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle 0, TRAINER_DARIAN, 0, Route104_Text_295C5D, Route104_Text_295CC9 - msgbox Route104_Text_295CD3, 6 + trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 + msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end Route104_Text_1ED5EC: @ 81ED5EC @@ -1060,26 +1042,26 @@ Route104_Text_1ED5EC: @ 81ED5EC Route104_Text_1ED662: @ 81ED662 .string "The sea, huh?\p" - .string "I wonder what it’s like at the bottom\n" + .string "I wonder what it's like at the bottom\n" .string "of the sea?$" Route104_Text_1ED6A2: @ 81ED6A2 - .string "If you’re going to throw a POKé BALL,\n" + .string "If you're going to throw a POKé BALL,\n" .string "weaken the wild POKéMON first.\p" - .string "It will be easier to catch if it’s been\n" + .string "It will be easier to catch if it's been\n" .string "poisoned, burned, or lulled to sleep.$" Route104_Text_1ED735: @ 81ED735 - .string "You’re a thief if you try to steal\n" - .string "someone else’s POKéMON.\p" + .string "You're a thief if you try to steal\n" + .string "someone else's POKéMON.\p" .string "You should throw POKé BALLS only at\n" .string "wild POKéMON.$" Route104_Text_1ED7A2: @ 81ED7A2 - .string "Oh, no, I’m not a TRAINER.\p" - .string "But that’s right, if TRAINERS lock eyes,\n" - .string "it’s a challenge to battle.\p" - .string "If you don’t want to battle, stay out\n" + .string "Oh, no, I'm not a TRAINER.\p" + .string "But that's right, if TRAINERS lock eyes,\n" + .string "it's a challenge to battle.\p" + .string "If you don't want to battle, stay out\n" .string "of their sight.$" Route104_Text_1ED838: @ 81ED838 @@ -1093,7 +1075,7 @@ Route104_Text_1ED8E7: @ 81ED8E7 .string "A word of advice!\p" .string "A TM, TECHNICAL MACHINE, is good only\n" .string "for one-time use.\p" - .string "Once you use it, it’s gone.\n" + .string "Once you use it, it's gone.\n" .string "Think twice before using it!$" Route104_Text_1ED96A: @ 81ED96A @@ -1101,7 +1083,7 @@ Route104_Text_1ED96A: @ 81ED96A .string "saplings recently.\p" .string "It made me so happy, I went overboard\n" .string "shopping.\p" - .string "I don’t need this WHITE HERB anymore.\n" + .string "I don't need this WHITE HERB anymore.\n" .string "Would you take it, please?$" Route104_Text_1EDA0F: @ 81EDA0F @@ -1111,7 +1093,7 @@ Route104_Text_1EDA0F: @ 81EDA0F .string "shopping. Where should I put them?$" Route104_Text_1EDA8C: @ 81EDA8C - .string "MR. BRINEY’S COTTAGE$" + .string "MR. BRINEY'S COTTAGE$" Route104_Text_1EDAA1: @ 81EDAA1 .string "ROUTE 1O4\n" @@ -1148,18 +1130,18 @@ Route104_Text_1EDC8F: @ 81EDC8F Route104_Text_1EDCB1: @ 81EDCB1 .string "MAY: Oh, by the way, {PLAYER}{KUN},\n" - .string "how’s your POKéDEX coming along?$" + .string "how's your POKéDEX coming along?$" Route104_Text_1EDCED: @ 81EDCED - .string "Mine’s looking pretty decent.\n" + .string "Mine's looking pretty decent.\n" .string "So…\l" .string "How about a little battle?$" Route104_Text_1EDD2A: @ 81EDD2A - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" + .string "MAY: Oh, what's the matter?\p" + .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" + .string "That's not very good for a TRAINER!$" Route104_Text_1EDD9F: @ 81EDD9F .string "MAY: So, what do you think?\n" @@ -1167,25 +1149,25 @@ Route104_Text_1EDD9F: @ 81EDD9F Route104_Text_1EDDDB: @ 81EDDDB .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" + .string "{PLAYER}{KUN}. I'm not going to lose!$" Route104_Text_1EDE18: @ 81EDE18 .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" Route104_Text_1EDE3E: @ 81EDE3E - .string "MAY: I can tell you’ve gotten pretty\n" + .string "MAY: I can tell you've gotten pretty\n" .string "good with the way you handle POKéMON.\p" .string "But instead of only making them\n" .string "battle, you should be like MR. BRINEY.\p" - .string "It’s important to become friends with\n" + .string "It's important to become friends with\n" .string "POKéMON, too.$" Route104_Text_1EDF04: @ 81EDF04 .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "Cool, you had DEVON install the MATCH\n" .string "CALL system on your POKéNAV!\p" - .string "Let’s register each other in our\n" + .string "Let's register each other in our\n" .string "POKéNAVS so we can keep in touch.$" Route104_Text_1EDFA0: @ 81EDFA0 @@ -1193,35 +1175,35 @@ Route104_Text_1EDFA0: @ 81EDFA0 .string "in the POKéNAV.$" Route104_Text_1EDFC6: @ 81EDFC6 - .string "BRENDAN: {PLAYER}, how’s your POKéDEX?\n" + .string "BRENDAN: {PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?$" Route104_Text_1EE009: @ 81EE009 - .string "Me, I’m doing great!\p" + .string "Me, I'm doing great!\p" .string "Want to check out how good I am with\n" .string "a battle?$" Route104_Text_1EE04D: @ 81EE04D - .string "BRENDAN: What’s the matter? Don’t have\n" + .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" Route104_Text_1EE094: @ 81EE094 - .string "BRENDAN: What’s up?\n" + .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" Route104_Text_1EE0C7: @ 81EE0C7 .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" + .string "a TRAINER, but I won't go easy!$" Route104_Text_1EE107: @ 81EE107 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" Route104_Text_1EE120: @ 81EE120 - .string "BRENDAN: You’ve gotten pretty decent\n" + .string "BRENDAN: You've gotten pretty decent\n" .string "at handling POKéMON.\p" - .string "But, you know, you shouldn’t just be\n" + .string "But, you know, you shouldn't just be\n" .string "making POKéMON battle.\p" - .string "Like MR. BRINEY, it’s important to\n" + .string "Like MR. BRINEY, it's important to\n" .string "become friends with your POKéMON.$" diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index aa40c8cb4..e8fc402c5 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -35,8 +35,8 @@ Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A setflag FLAG_0x093 - msgbox Route104_MrBrineysHouse_Text_229E70, 4 - msgbox Route104_MrBrineysHouse_Text_229E9B, 5 + msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT + msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 @@ -53,31 +53,31 @@ Route104_MrBrineysHouse_EventScript_229DAE:: @ 8229DAE end Route104_MrBrineysHouse_EventScript_229DE1:: @ 8229DE1 - msgbox Route104_MrBrineysHouse_Text_22A0AD, 5 + msgbox Route104_MrBrineysHouse_Text_22A0AD, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229DFA:: @ 8229DFA - msgbox Route104_MrBrineysHouse_Text_22A18F, 5 + msgbox Route104_MrBrineysHouse_Text_22A18F, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route104_MrBrineysHouse_EventScript_229E13 goto Route104_MrBrineysHouse_EventScript_229E27 end Route104_MrBrineysHouse_EventScript_229E13:: @ 8229E13 - msgbox Route104_MrBrineysHouse_Text_22A041, 4 + msgbox Route104_MrBrineysHouse_Text_22A041, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D - msgbox Route104_MrBrineysHouse_Text_22A2C3, 4 + msgbox Route104_MrBrineysHouse_Text_22A2C3, MSGBOX_DEFAULT release end Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27 - msgbox Route104_MrBrineysHouse_Text_229FE9, 4 + msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT call Route104_MrBrineysHouse_EventScript_271E95 setvar VAR_0x408E, 1 clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY @@ -97,7 +97,7 @@ Route104_MrBrineysHouse_EventScript_229E5D:: @ 8229E5D faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route104_MrBrineysHouse_Text_22A337, 4 + msgbox Route104_MrBrineysHouse_Text_22A337, MSGBOX_DEFAULT waitmoncry release end @@ -107,24 +107,24 @@ Route104_MrBrineysHouse_Text_229E70: @ 8229E70 .string "Wait up, PEEKO!$" Route104_MrBrineysHouse_Text_229E9B: @ 8229E9B - .string "Hm? You’re {PLAYER}{KUN}!\n" + .string "Hm? You're {PLAYER}{KUN}!\n" .string "You saved my darling PEEKO!\l" .string "We owe so much to you!\p" - .string "What’s that?\n" + .string "What's that?\n" .string "You want to sail with me?\p" .string "Hmhm…\p" .string "You have a LETTER bound for DEWFORD\n" .string "and a package for SLATEPORT, then?\p" .string "Quite the busy life you must lead!\p" - .string "But, certainly, what you’re asking is\n" + .string "But, certainly, what you're asking is\n" .string "no problem at all.\p" - .string "You’ve come to the right man!\n" - .string "We’ll set sail for DEWFORD.$" + .string "You've come to the right man!\n" + .string "We'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_229FE9: @ 8229FE9 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" Route104_MrBrineysHouse_Text_22A041: @ 822A041 .string "MR. BRINEY: Is that so?\n" @@ -135,24 +135,24 @@ Route104_MrBrineysHouse_Text_22A041: @ 822A041 Route104_MrBrineysHouse_Text_22A0AD: @ 822A0AD .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" - .string "You’re to deliver a LETTER to DEWFORD\n" + .string "You're to deliver a LETTER to DEWFORD\n" .string "and a package to SLATEPORT.\p" .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "at all--I'm the man for the job!\p" + .string "First, we'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_22A18F: @ 822A18F .string "MR. BRINEY: Ahoy!\n" .string "I know exactly what you want to say!\p" - .string "You’re to deliver a package to\n" + .string "You're to deliver a package to\n" .string "CAPT. STERN in SLATEPORT.\p" .string "What you need me to do is no problem\n" - .string "at all--I’m the man for the job!\p" - .string "First, we’ll set sail for DEWFORD.$" + .string "at all--I'm the man for the job!\p" + .string "First, we'll set sail for DEWFORD.$" Route104_MrBrineysHouse_Text_22A268: @ 822A268 .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" Route104_MrBrineysHouse_Text_22A2C3: @ 822A2C3 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index eefc723b6..08b5b7389 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -20,11 +20,11 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 faceplayer checkflag FLAG_TEMP_1 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3E4 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT checkflag FLAG_0x07F goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A3B2 setflag FLAG_0x07F - msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -33,7 +33,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 end Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, 5 + msgbox Route104_PrettyPetalFlowerShop_Text_2A76D9, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_22A3D2 compare VAR_RESULT, 0 @@ -42,18 +42,18 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3B2:: @ 822A3B2 end Route104_PrettyPetalFlowerShop_EventScript_22A3D2:: @ 822A3D2 - msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A775B, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB - msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A78DF, MSGBOX_DEFAULT return Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 message gUnknown_08272A52 waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -74,14 +74,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C faceplayer checkflag FLAG_0x05E goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_22A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL - msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT setflag FLAG_0x05E release end @@ -92,19 +92,19 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 dodailyevents checkflag FLAG_0x930 goto_eq Route104_PrettyPetalFlowerShop_EventScript_22A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route104_PrettyPetalFlowerShop_EventScript_272054 setflag FLAG_0x930 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 - msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, 4 + msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 3cb6d9ae6..617e84350 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -32,58 +32,55 @@ Route105_MapScript2_1EE240: @ 81EE240 .2byte 0 Route105_EventScript_1EE24A:: @ 81EE24A - trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_295D0F, Route105_Text_295D62 - msgbox Route105_Text_295DAB, 6 + trainerbattle_single TRAINER_FOSTER, Route105_Text_295D0F, Route105_Text_295D62 + msgbox Route105_Text_295DAB, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE261:: @ 81EE261 - trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_295DF5, Route105_Text_295E66 - msgbox Route105_Text_295E72, 6 + trainerbattle_single TRAINER_LUIS, Route105_Text_295DF5, Route105_Text_295E66 + msgbox Route105_Text_295E72, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE278:: @ 81EE278 - trainerbattle 0, TRAINER_DOMINIK, 0, Route105_Text_295EB7, Route105_Text_295EEA - msgbox Route105_Text_295F08, 6 + trainerbattle_single TRAINER_DOMINIK, Route105_Text_295EB7, Route105_Text_295EEA + msgbox Route105_Text_295F08, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE28F:: @ 81EE28F - trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_295F5C, Route105_Text_295FA0 - msgbox Route105_Text_295FAE, 6 + trainerbattle_single TRAINER_BEVERLY, Route105_Text_295F5C, Route105_Text_295FA0 + msgbox Route105_Text_295FAE, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2A6:: @ 81EE2A6 - trainerbattle 0, TRAINER_IMANI, 0, Route105_Text_296025, Route105_Text_296059 - msgbox Route105_Text_296076, 6 + trainerbattle_single TRAINER_IMANI, Route105_Text_296025, Route105_Text_296059 + msgbox Route105_Text_296076, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2BD:: @ 81EE2BD - trainerbattle 0, TRAINER_JOSUE, 0, Route105_Text_29626F, Route105_Text_2962CB - msgbox Route105_Text_2962EC, 6 + trainerbattle_single TRAINER_JOSUE, Route105_Text_29626F, Route105_Text_2962CB + msgbox Route105_Text_2962EC, MSGBOX_AUTOCLOSE end Route105_EventScript_1EE2D4:: @ 81EE2D4 - trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 + trainerbattle_single TRAINER_ANDRES_1, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F - msgbox Route105_Text_2960FA, 4 + msgbox Route105_Text_2960FA, MSGBOX_DEFAULT release end Route105_EventScript_1EE300:: @ 81EE300 special sub_80B4808 waitmovement 0 - msgbox Route105_Text_296159, 4 - setvar VAR_0x8004, 737 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 737 - callstd 8 + msgbox Route105_Text_296159, MSGBOX_DEFAULT + register_matchcall TRAINER_ANDRES_1 release end Route105_EventScript_1EE31F:: @ 81EE31F - trainerbattle 5, TRAINER_ANDRES_1, 0, Route105_Text_29619E, Route105_Text_2961DD - msgbox Route105_Text_2961FE, 6 + trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_29619E, Route105_Text_2961DD + msgbox Route105_Text_2961FE, MSGBOX_AUTOCLOSE end Route104_Text_1EE336: @ 81EE336 @@ -93,11 +90,11 @@ Route104_Text_1EE336: @ 81EE336 .string "… … … … … …\n" .string "Where are you now?\l" .string "It sounds windy wherever you are.\p" - .string "I just heard from DEVON’s MR. STONE\n" + .string "I just heard from DEVON's MR. STONE\n" .string "about your POKéNAV, so I decided\l" .string "to give you a call.\p" - .string "It sounds like you’re doing fine,\n" - .string "so that’s fine with me.\p" + .string "It sounds like you're doing fine,\n" + .string "so that's fine with me.\p" .string "You take care now.\p" .string "… … … … … …\n" .string "… … … … … Click!$" diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index fdfff0587..533f65254 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -2,47 +2,44 @@ Route106_MapScripts:: @ 81EE489 .byte 0 Route106_EventScript_1EE48A:: @ 81EE48A - msgbox Route106_Text_1EE53A, 3 + msgbox Route106_Text_1EE53A, MSGBOX_SIGN end Route106_EventScript_1EE493:: @ 81EE493 - trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD - msgbox Route106_Text_296608, 6 + trainerbattle_single TRAINER_DOUGLAS, Route106_Text_2965BB, Route106_Text_2965FD + msgbox Route106_Text_296608, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4AA:: @ 81EE4AA - trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 - msgbox Route106_Text_29669E, 6 + trainerbattle_single TRAINER_KYLA, Route106_Text_296628, Route106_Text_296674 + msgbox Route106_Text_29669E, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE4C1:: @ 81EE4C1 - trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route106_EventScript_1EE50C - msgbox Route106_Text_29638C, 4 + msgbox Route106_Text_29638C, MSGBOX_DEFAULT release end Route106_EventScript_1EE4ED:: @ 81EE4ED special sub_80B4808 waitmovement 0 - msgbox Route106_Text_2963E3, 4 - setvar VAR_0x8004, 339 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 339 - callstd 8 + msgbox Route106_Text_2963E3, MSGBOX_DEFAULT + register_matchcall TRAINER_ELLIOT_1 release end Route106_EventScript_1EE50C:: @ 81EE50C - trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 - msgbox Route106_Text_296493, 6 + trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_29642E, Route106_Text_296477 + msgbox Route106_Text_296493, MSGBOX_AUTOCLOSE end Route106_EventScript_1EE523:: @ 81EE523 - trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 - msgbox Route106_Text_296588, 6 + trainerbattle_single TRAINER_NED, Route106_Text_2964D4, Route106_Text_296553 + msgbox Route106_Text_296588, MSGBOX_AUTOCLOSE end Route106_Text_1EE53A: @ 81EE53A diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 2c8364592..5f840b3fb 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,57 +2,54 @@ Route107_MapScripts:: @ 81EE594 .byte 0 Route107_EventScript_1EE595:: @ 81EE595 - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_2966E5, Route107_Text_29672F - msgbox Route107_Text_29675B, 6 + trainerbattle_single TRAINER_DARRIN, Route107_Text_2966E5, Route107_Text_29672F + msgbox Route107_Text_29675B, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE5AC:: @ 81EE5AC - trainerbattle 2, TRAINER_TONY_1, 0, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 + trainerbattle_single TRAINER_TONY_1, Route107_Text_2967AD, Route107_Text_2967D8, Route107_EventScript_1EE5D8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route107_EventScript_1EE5F7 - msgbox Route107_Text_2967FF, 4 + msgbox Route107_Text_2967FF, MSGBOX_DEFAULT release end Route107_EventScript_1EE5D8:: @ 81EE5D8 special sub_80B4808 waitmovement 0 - msgbox Route107_Text_29685A, 4 - setvar VAR_0x8004, 155 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 155 - callstd 8 + msgbox Route107_Text_29685A, MSGBOX_DEFAULT + register_matchcall TRAINER_TONY_1 release end Route107_EventScript_1EE5F7:: @ 81EE5F7 - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_296897, Route107_Text_2968D5 - msgbox Route107_Text_296923, 6 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_296897, Route107_Text_2968D5 + msgbox Route107_Text_296923, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE60E:: @ 81EE60E - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_296974, Route107_Text_29699E - msgbox Route107_Text_2969AB, 6 + trainerbattle_single TRAINER_DENISE, Route107_Text_296974, Route107_Text_29699E + msgbox Route107_Text_2969AB, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE625:: @ 81EE625 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_2969E4, Route107_Text_296A17 - msgbox Route107_Text_296A35, 6 + trainerbattle_single TRAINER_BETH, Route107_Text_2969E4, Route107_Text_296A17 + msgbox Route107_Text_296A35, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE63C:: @ 81EE63C - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E - msgbox Route107_Text_296ADC, 6 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296A77, Route107_Text_296AA7, Route107_Text_296B1E + msgbox Route107_Text_296ADC, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE657:: @ 81EE657 - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 - msgbox Route107_Text_296BE1, 6 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_296B57, Route107_Text_296BB3, Route107_Text_296C34 + msgbox Route107_Text_296BE1, MSGBOX_AUTOCLOSE end Route107_EventScript_1EE672:: @ 81EE672 - trainerbattle 0, TRAINER_CAMRON, 0, Route107_Text_296C6F, Route107_Text_296CAD - msgbox Route107_Text_296CC0, 6 + trainerbattle_single TRAINER_CAMRON, Route107_Text_296C6F, Route107_Text_296CAD + msgbox Route107_Text_296CC0, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 25657c5a4..73ddb031d 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,52 +2,49 @@ Route108_MapScripts:: @ 81EE689 .byte 0 Route108_EventScript_1EE68A:: @ 81EE68A - trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_296D10, Route108_Text_296D3C - msgbox Route108_Text_296D6E, 6 + trainerbattle_single TRAINER_JEROME, Route108_Text_296D10, Route108_Text_296D3C + msgbox Route108_Text_296D6E, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6A1:: @ 81EE6A1 - trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_296DAF, Route108_Text_296DEA - msgbox Route108_Text_296E03, 6 + trainerbattle_single TRAINER_MATTHEW, Route108_Text_296DAF, Route108_Text_296DEA + msgbox Route108_Text_296E03, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6B8:: @ 81EE6B8 - trainerbattle 0, TRAINER_TARA, 0, Route108_Text_296E33, Route108_Text_296E71 - msgbox Route108_Text_296E7A, 6 + trainerbattle_single TRAINER_TARA, Route108_Text_296E33, Route108_Text_296E71 + msgbox Route108_Text_296E7A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6CF:: @ 81EE6CF - trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_296EC7, Route108_Text_296EFC - msgbox Route108_Text_296F2A, 6 + trainerbattle_single TRAINER_MISSY, Route108_Text_296EC7, Route108_Text_296EFC + msgbox Route108_Text_296F2A, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6E6:: @ 81EE6E6 - trainerbattle 0, TRAINER_CAROLINA, 0, Route108_Text_297094, Route108_Text_2970D7 - msgbox Route108_Text_2970F0, 6 + trainerbattle_single TRAINER_CAROLINA, Route108_Text_297094, Route108_Text_2970D7 + msgbox Route108_Text_2970F0, MSGBOX_AUTOCLOSE end Route108_EventScript_1EE6FD:: @ 81EE6FD - trainerbattle 2, TRAINER_CORY_1, 0, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 + trainerbattle_single TRAINER_CORY_1, Route108_Text_296F5D, Route108_Text_296F93, Route108_EventScript_1EE729 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route108_EventScript_1EE748 - msgbox Route108_Text_296FB0, 4 + msgbox Route108_Text_296FB0, MSGBOX_DEFAULT release end Route108_EventScript_1EE729:: @ 81EE729 special sub_80B4808 waitmovement 0 - msgbox Route108_Text_296FD8, 4 - setvar VAR_0x8004, 740 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 740 - callstd 8 + msgbox Route108_Text_296FD8, MSGBOX_DEFAULT + register_matchcall TRAINER_CORY_1 release end Route108_EventScript_1EE748:: @ 81EE748 - trainerbattle 5, TRAINER_CORY_1, 0, Route108_Text_297011, Route108_Text_297036 - msgbox Route108_Text_297059, 6 + trainerbattle_rematch TRAINER_CORY_1, Route108_Text_297011, Route108_Text_297036 + msgbox Route108_Text_297059, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index f87572891..52f6437ae 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -53,7 +53,7 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT hideobjectat 1, MAP_ROUTE109 - msgbox Route109_Text_1E9C1D, 4 + msgbox Route109_Text_1E9C1D, MSGBOX_DEFAULT closemessage copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE109 @@ -279,7 +279,7 @@ Route109_EventScript_1EE910:: @ 81EE910 Route109_EventScript_1EE921:: @ 81EE921 message Route109_Text_1EEC96 - msgbox Route109_Text_1EEC96, 5 + msgbox Route109_Text_1EEC96, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route109_EventScript_1EE981 goto Route109_EventScript_1EE972 @@ -296,29 +296,29 @@ Route109_EventScript_1EE93F:: @ 81EE93F end Route109_EventScript_1EE972:: @ 81EE972 - msgbox Route109_Text_1EED06, 4 + msgbox Route109_Text_1EED06, MSGBOX_DEFAULT closemessage goto Route109_EventScript_1EE760 end Route109_EventScript_1EE981:: @ 81EE981 - msgbox Route109_Text_1EED5E, 4 + msgbox Route109_Text_1EED5E, MSGBOX_DEFAULT release end Route109_EventScript_1EE98B:: @ 81EE98B - msgbox Route109_Text_1EEE72, 4 + msgbox Route109_Text_1EEE72, MSGBOX_DEFAULT release end Route109_EventScript_1EE995:: @ 81EE995 - msgbox Route109_Text_1EEEB4, 2 + msgbox Route109_Text_1EEEB4, MSGBOX_NPC end Route109_EventScript_1EE99E:: @ 81EE99E lock faceplayer - msgbox Route109_Text_1EEFB0, 4 + msgbox Route109_Text_1EEFB0, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 @@ -331,7 +331,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 special GetPlayerBigGuyGirlString checkflag FLAG_0x118 goto_eq Route109_EventScript_1EE9F2 - msgbox Route109_Text_1EEFDE, 4 + msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 goto_eq Route109_EventScript_272054 @@ -343,18 +343,18 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 end Route109_EventScript_1EE9F2:: @ 81EE9F2 - msgbox Route109_Text_1EEFF1, 4 + msgbox Route109_Text_1EEFF1, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 release end Route109_EventScript_1EEA06:: @ 81EEA06 - msgbox Route109_Text_1EEF08, 2 + msgbox Route109_Text_1EEF08, MSGBOX_NPC end Route109_EventScript_1EEA0F:: @ 81EEA0F - msgbox Route109_Text_1EF080, 2 + msgbox Route109_Text_1EF080, MSGBOX_NPC end Route109_EventScript_1EEA18:: @ 81EEA18 @@ -362,137 +362,131 @@ Route109_EventScript_1EEA18:: @ 81EEA18 faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox Route109_Text_1EF173, 4 + msgbox Route109_Text_1EF173, MSGBOX_DEFAULT waitmoncry release end Route109_EventScript_1EEA2B:: @ 81EEA2B - msgbox Route109_Text_1EF185, 3 + msgbox Route109_Text_1EF185, MSGBOX_SIGN end Route109_EventScript_1EEA34:: @ 81EEA34 - msgbox Route109_Text_1EF1D5, 3 + msgbox Route109_Text_1EF1D5, MSGBOX_SIGN end Route109_EventScript_1EEA3D:: @ 81EEA3D - trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_297140, Route109_Text_29717D - msgbox Route109_Text_297191, 6 + trainerbattle_single TRAINER_DAVID, Route109_Text_297140, Route109_Text_29717D + msgbox Route109_Text_297191, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA54:: @ 81EEA54 - trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_2971D1, Route109_Text_2971FD - msgbox Route109_Text_29720F, 6 + trainerbattle_single TRAINER_ALICE, Route109_Text_2971D1, Route109_Text_2971FD + msgbox Route109_Text_29720F, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA6B:: @ 81EEA6B - trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_297235, Route109_Text_29727B - msgbox Route109_Text_29728C, 6 + trainerbattle_single TRAINER_HUEY, Route109_Text_297235, Route109_Text_29727B + msgbox Route109_Text_29728C, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA82:: @ 81EEA82 - trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_2972B3, Route109_Text_2972CE - msgbox Route109_Text_2972ED, 6 + trainerbattle_single TRAINER_EDMOND, Route109_Text_2972B3, Route109_Text_2972CE + msgbox Route109_Text_2972ED, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEA99:: @ 81EEA99 - trainerbattle 2, TRAINER_RICKY_1, 0, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 + trainerbattle_single TRAINER_RICKY_1, Route109_Text_29733B, Route109_Text_297379, Route109_EventScript_1EEAC5 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEAE4 - msgbox Route109_Text_297380, 4 + msgbox Route109_Text_297380, MSGBOX_DEFAULT release end Route109_EventScript_1EEAC5:: @ 81EEAC5 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_2973C1, 4 - setvar VAR_0x8004, 64 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 64 - callstd 8 + msgbox Route109_Text_2973C1, MSGBOX_DEFAULT + register_matchcall TRAINER_RICKY_1 release end Route109_EventScript_1EEAE4:: @ 81EEAE4 - trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_2973FF, Route109_Text_297437 - msgbox Route109_Text_297458, 6 + trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_2973FF, Route109_Text_297437 + msgbox Route109_Text_297458, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEAFB:: @ 81EEAFB - trainerbattle 2, TRAINER_LOLA_1, 0, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 + trainerbattle_single TRAINER_LOLA_1, Route109_Text_29749C, Route109_Text_2974CF, Route109_EventScript_1EEB27 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route109_EventScript_1EEB46 - msgbox Route109_Text_2974D6, 4 + msgbox Route109_Text_2974D6, MSGBOX_DEFAULT release end Route109_EventScript_1EEB27:: @ 81EEB27 special sub_80B4808 waitmovement 0 - msgbox Route109_Text_297520, 4 - setvar VAR_0x8004, 57 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 57 - callstd 8 + msgbox Route109_Text_297520, MSGBOX_DEFAULT + register_matchcall TRAINER_LOLA_1 release end Route109_EventScript_1EEB46:: @ 81EEB46 - trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_297538, Route109_Text_297576 - msgbox Route109_Text_29757D, 6 + trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_297538, Route109_Text_297576 + msgbox Route109_Text_29757D, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB5D:: @ 81EEB5D - trainerbattle 0, TRAINER_AUSTINA, 0, Route109_Text_2975C0, Route109_Text_297601 - msgbox Route109_Text_29762A, 6 + trainerbattle_single TRAINER_AUSTINA, Route109_Text_2975C0, Route109_Text_297601 + msgbox Route109_Text_29762A, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB74:: @ 81EEB74 - trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_297667, Route109_Text_297691 - msgbox Route109_Text_2976A4, 6 + trainerbattle_single TRAINER_GWEN, Route109_Text_297667, Route109_Text_297691 + msgbox Route109_Text_2976A4, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEB8B:: @ 81EEB8B - trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_2976C5, Route109_Text_2976FC - msgbox Route109_Text_297715, 6 + trainerbattle_single TRAINER_CARTER, Route109_Text_2976C5, Route109_Text_2976FC + msgbox Route109_Text_297715, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBA2:: @ 81EEBA2 - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D - msgbox Route109_Text_2977C7, 6 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297754, Route109_Text_2977B0, Route109_Text_29781D + msgbox Route109_Text_2977C7, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBBD:: @ 81EEBBD - trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E - msgbox Route109_Text_2978F1, 6 + trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_297872, Route109_Text_2978BD, Route109_Text_29792E + msgbox Route109_Text_2978F1, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBD8:: @ 81EEBD8 - trainerbattle 0, TRAINER_CHANDLER, 0, Route109_Text_29798A, Route109_Text_2979AE - msgbox Route109_Text_2979BF, 6 + trainerbattle_single TRAINER_CHANDLER, Route109_Text_29798A, Route109_Text_2979AE + msgbox Route109_Text_2979BF, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEBEF:: @ 81EEBEF - trainerbattle 0, TRAINER_HAILEY, 0, Route109_Text_2979EC, Route109_Text_297A15 - msgbox Route109_Text_297A40, 6 + trainerbattle_single TRAINER_HAILEY, Route109_Text_2979EC, Route109_Text_297A15 + msgbox Route109_Text_297A40, MSGBOX_AUTOCLOSE end Route109_EventScript_1EEC06:: @ 81EEC06 - trainerbattle 0, TRAINER_ELIJAH, 0, Route109_Text_297A82, Route109_Text_297AC7 - msgbox Route109_Text_297AE5, 6 + trainerbattle_single TRAINER_ELIJAH, Route109_Text_297A82, Route109_Text_297AC7 + msgbox Route109_Text_297AE5, MSGBOX_AUTOCLOSE end DewfordTown_Text_1EEC1D: @ 81EEC1D .string "MR. BRINEY: Ahoy!\n" - .string "We’ve made land in SLATEPORT!\p" - .string "I suppose you’re going to visit CAPT.\n" + .string "We've made land in SLATEPORT!\p" + .string "I suppose you're going to visit CAPT.\n" .string "STERN and deliver the DEVON GOODS?$" Route109_Text_1EEC96: @ 81EEC96 - .string "MR. BRINEY: I thought you’re supposed\n" + .string "MR. BRINEY: I thought you're supposed\n" .string "to deliver the DEVON GOODS.\p" .string "Would you like to sail back to\n" .string "DEWFORD, then?$" @@ -500,21 +494,21 @@ Route109_Text_1EEC96: @ 81EEC96 Route109_Text_1EED06: @ 81EED06 .string "MR. BRINEY: DEWFORD it is, then!\p" .string "Anchors aweigh!\n" - .string "PEEKO, we’re setting sail, my darling!$" + .string "PEEKO, we're setting sail, my darling!$" Route109_Text_1EED5E: @ 81EED5E .string "MR. BRINEY: Then you go on and deliver\n" - .string "the DEVON GOODS. I’ll be waiting.$" + .string "the DEVON GOODS. I'll be waiting.$" DewfordTown_Text_1EEDA7: @ 81EEDA7 - .string "MR. BRINEY: Ahoy! We’ve made land in\n" + .string "MR. BRINEY: Ahoy! We've made land in\n" .string "SLATEPORT!\p" .string "You just go on and tell me whenever\n" .string "you want to set sail again!$" Route109_Text_1EEE17: @ 81EEE17 .string "MR. BRINEY: Ahoy!\n" - .string "For you, I’ll go out to sea anytime!\p" + .string "For you, I'll go out to sea anytime!\p" .string "Now, my friend, where are we bound?$" Route109_Text_1EEE72: @ 81EEE72 @@ -523,30 +517,30 @@ Route109_Text_1EEE72: @ 81EEE72 Route109_Text_1EEEB4: @ 81EEEB4 .string "Yo, TRAINERS!\n" - .string "Whether you’re hot to trot,\l" + .string "Whether you're hot to trot,\l" .string "or cool cat not,\l" - .string "chill at my papa’s spot!$" + .string "chill at my papa's spot!$" Route109_Text_1EEF08: @ 81EEF08 .string "Little kids can dart around so quickly…\p" - .string "You don’t dare take your eyes off them\n" - .string "for an instant. It’s very taxing.\p" + .string "You don't dare take your eyes off them\n" + .string "for an instant. It's very taxing.\p" .string "Mine are with my POKéMON, so they\n" .string "should be okay, but…$" Route109_Text_1EEFB0: @ 81EEFB0 - .string "Our sand castle’s taking a long time\n" + .string "Our sand castle's taking a long time\n" .string "to make.$" Route109_Text_1EEFDE: @ 81EEFDE .string "You can have this!$" Route109_Text_1EEFF1: @ 81EEFF1 - .string "We’re going to get all the sand from\n" + .string "We're going to get all the sand from\n" .string "the beach and make a big castle!\p" - .string "And then we’re going to be a king and\n" + .string "And then we're going to be a king and\n" .string "queen.\p" - .string "We’ll let you be a servant.$" + .string "We'll let you be a servant.$" Route109_Text_1EF080: @ 81EF080 .string "The water around these parts is clean.\p" diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index cb617e2f9..fd0b224bc 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -15,18 +15,18 @@ Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE goto_eq Route109_SeashoreHouse_EventScript_269432 checkflag FLAG_TEMP_2 goto_eq Route109_SeashoreHouse_EventScript_269428 - msgbox Route109_SeashoreHouse_Text_269555, 4 + msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end Route109_SeashoreHouse_EventScript_269428:: @ 8269428 - msgbox Route109_SeashoreHouse_Text_269635, 4 + msgbox Route109_SeashoreHouse_Text_269635, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269432:: @ 8269432 - msgbox Route109_SeashoreHouse_Text_269685, 4 + msgbox Route109_SeashoreHouse_Text_269685, MSGBOX_DEFAULT giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_269456 @@ -35,16 +35,16 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 end Route109_SeashoreHouse_EventScript_269456:: @ 8269456 - msgbox Route109_SeashoreHouse_Text_26973A, 4 + msgbox Route109_SeashoreHouse_Text_26973A, MSGBOX_DEFAULT release end Route109_SeashoreHouse_EventScript_269460:: @ 8269460 showmoneybox 0, 0, 0 - msgbox Route109_SeashoreHouse_Text_26977E, 5 + msgbox Route109_SeashoreHouse_Text_26977E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route109_SeashoreHouse_EventScript_269484 - msgbox Route109_SeashoreHouse_Text_2697EF, 4 + msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT hidemoneybox nop nop @@ -58,7 +58,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 checkitemspace ITEM_SODA_POP, 1 compare VAR_RESULT, 0 goto_eq Route109_SeashoreHouse_EventScript_2694D5 - msgbox Route109_SeashoreHouse_Text_2697C8, 4 + msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT takemoney 0x12c, 0 updatemoneybox 0, 0 nop @@ -70,7 +70,7 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484 end Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 - msgbox Route109_SeashoreHouse_Text_2697D5, 4 + msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT hidemoneybox nop nop @@ -78,7 +78,7 @@ Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8 end Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 - msgbox gUnknown_08272AD0, 4 + msgbox gUnknown_08272AD0, MSGBOX_DEFAULT hidemoneybox nop nop @@ -86,18 +86,18 @@ Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5 end Route109_SeashoreHouse_EventScript_2694E2:: @ 82694E2 - trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_26989D, 6 + trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_269803, Route109_SeashoreHouse_Text_269867, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_26989D, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_2694FD:: @ 82694FD - trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_269953, 6 + trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_2698E3, Route109_SeashoreHouse_Text_269947, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_269953, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269518:: @ 8269518 - trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 - msgbox Route109_SeashoreHouse_Text_2699DF, 6 + trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_269986, Route109_SeashoreHouse_Text_2699C5, Route109_SeashoreHouse_EventScript_269533 + msgbox Route109_SeashoreHouse_Text_2699DF, MSGBOX_AUTOCLOSE end Route109_SeashoreHouse_EventScript_269533:: @ 8269533 @@ -116,13 +116,13 @@ Route109_SeashoreHouse_EventScript_269553:: @ 8269553 end Route109_SeashoreHouse_Text_269555: @ 8269555 - .string "I’m the owner of the SEASHORE HOUSE.\n" + .string "I'm the owner of the SEASHORE HOUSE.\n" .string "But you can call me MR. SEA!\p" .string "What I love above all is to see hot\n" .string "POKéMON battles.\p" .string "Let me see that your heart burns hot!\p" .string "If you can defeat all the TRAINERS\n" - .string "here, I’ll reward your efforts.$" + .string "here, I'll reward your efforts.$" Route109_SeashoreHouse_Text_269635: @ 8269635 .string "Show me some hot matches!\p" @@ -130,16 +130,16 @@ Route109_SeashoreHouse_Text_269635: @ 8269635 .string "that reason alone!$" Route109_SeashoreHouse_Text_269685: @ 8269685 - .string "You’re scorching hot!\n" + .string "You're scorching hot!\n" .string "Those battles blazed!\l" - .string "I’m more than just satisfied!\p" + .string "I'm more than just satisfied!\p" .string "As thanks for showing me your hot\n" .string "streak, I want you to take these.\p" - .string "It’s half a dozen bottles of SODA POP!$" + .string "It's half a dozen bottles of SODA POP!$" Route109_SeashoreHouse_Text_26973A: @ 826973A - .string "Oh, but hey, your BAG’s jammed full.\n" - .string "I’ll hang on to these for you.$" + .string "Oh, but hey, your BAG's jammed full.\n" + .string "I'll hang on to these for you.$" Route109_SeashoreHouse_Text_26977E: @ 826977E .string "Want to buy some SODA POP?\n" @@ -151,15 +151,15 @@ Route109_SeashoreHouse_Text_2697C8: @ 82697C8 .string "Here you go!$" Route109_SeashoreHouse_Text_2697D5: @ 82697D5 - .string "You don’t have the money.$" + .string "You don't have the money.$" Route109_SeashoreHouse_Text_2697EF: @ 82697EF .string "No?\n" - .string "That’s too bad.$" + .string "That's too bad.$" Route109_SeashoreHouse_Text_269803: @ 8269803 - .string "If you’re looking for a battle in the\n" - .string "SEASHORE HOUSE, you’ll find no\l" + .string "If you're looking for a battle in the\n" + .string "SEASHORE HOUSE, you'll find no\l" .string "hotter TRAINER than me, matey!$" Route109_SeashoreHouse_Text_269867: @ 8269867 @@ -167,27 +167,27 @@ Route109_SeashoreHouse_Text_269867: @ 8269867 .string "I can accept that loss, matey!$" Route109_SeashoreHouse_Text_26989D: @ 826989D - .string "Whenever I’m in SLATEPORT, I enjoy\n" + .string "Whenever I'm in SLATEPORT, I enjoy\n" .string "hot battles and ice-cold SODA POP!$" Route109_SeashoreHouse_Text_2698E3: @ 82698E3 - .string "Boring battles aren’t worth the effort.\p" + .string "Boring battles aren't worth the effort.\p" .string "Fiery hot battles are what toughen up\n" .string "TRAINERS and POKéMON!$" Route109_SeashoreHouse_Text_269947: @ 8269947 - .string "That’s hot!$" + .string "That's hot!$" Route109_SeashoreHouse_Text_269953: @ 8269953 - .string "Whew, I’m all thirsty.\n" - .string "Maybe I’ll have a SODA POP.$" + .string "Whew, I'm all thirsty.\n" + .string "Maybe I'll have a SODA POP.$" Route109_SeashoreHouse_Text_269986: @ 8269986 - .string "I’m going to show you how great\n" - .string "my POKéMON are, but don’t cry!$" + .string "I'm going to show you how great\n" + .string "my POKéMON are, but don't cry!$" Route109_SeashoreHouse_Text_2699C5: @ 82699C5 - .string "…I lost, but I won’t cry…$" + .string "…I lost, but I won't cry…$" Route109_SeashoreHouse_Text_2699DF: @ 82699DF .string "If one of my POKéMON knew the move\n" diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index fe07de8dc..c5d53b5b4 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -31,7 +31,7 @@ Route110_EventScript_1EF2A1:: @ 81EF2A1 Route110_EventScript_1EF2AA:: @ 81EF2AA lock faceplayer - msgbox Route110_Text_1EFB5D, 4 + msgbox Route110_Text_1EFB5D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -40,7 +40,7 @@ Route110_EventScript_1EF2AA:: @ 81EF2AA Route110_EventScript_1EF2C0:: @ 81EF2C0 lock faceplayer - msgbox Route110_Text_1EFB93, 4 + msgbox Route110_Text_1EFB93, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -49,7 +49,7 @@ Route110_EventScript_1EF2C0:: @ 81EF2C0 Route110_EventScript_1EF2D6:: @ 81EF2D6 lock faceplayer - msgbox Route110_Text_1EFBCA, 4 + msgbox Route110_Text_1EFBCA, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release @@ -58,74 +58,74 @@ Route110_EventScript_1EF2D6:: @ 81EF2D6 Route110_EventScript_1EF2EC:: @ 81EF2EC lock faceplayer - msgbox Route110_Text_1EFC0D, 4 + msgbox Route110_Text_1EFC0D, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, Route110_Movement_2725A2 waitmovement 0 release end Route110_EventScript_1EF302:: @ 81EF302 - msgbox Route110_Text_1EFFC3, 2 + msgbox Route110_Text_1EFFC3, MSGBOX_NPC end Route110_EventScript_1EF30B:: @ 81EF30B - msgbox Route110_Text_1F0006, 2 + msgbox Route110_Text_1F0006, MSGBOX_NPC end Route110_EventScript_1EF314:: @ 81EF314 - msgbox Route110_Text_1F006A, 2 + msgbox Route110_Text_1F006A, MSGBOX_NPC end Route110_EventScript_1EF31D:: @ 81EF31D - msgbox Route110_Text_1F0261, 2 + msgbox Route110_Text_1F0261, MSGBOX_NPC end Route110_EventScript_1EF326:: @ 81EF326 - msgbox Route110_Text_1F02CA, 2 + msgbox Route110_Text_1F02CA, MSGBOX_NPC end Route110_EventScript_1EF32F:: @ 81EF32F - msgbox Route110_Text_1F030E, 2 + msgbox Route110_Text_1F030E, MSGBOX_NPC end Route110_EventScript_1EF338:: @ 81EF338 - msgbox Route110_Text_1F0390, 2 + msgbox Route110_Text_1F0390, MSGBOX_NPC end Route110_EventScript_1EF341:: @ 81EF341 - msgbox Route110_Text_1F0812, 3 + msgbox Route110_Text_1F0812, MSGBOX_SIGN end Route110_EventScript_1EF34A:: @ 81EF34A - msgbox Route110_Text_1F082D, 3 + msgbox Route110_Text_1F082D, MSGBOX_SIGN end Route110_EventScript_1EF353:: @ 81EF353 - msgbox Route110_Text_1F0842, 3 + msgbox Route110_Text_1F0842, MSGBOX_SIGN end Route110_EventScript_1EF35C:: @ 81EF35C - msgbox Route110_Text_1F08CD, 3 + msgbox Route110_Text_1F08CD, MSGBOX_SIGN end Route110_EventScript_1EF365:: @ 81EF365 - msgbox Route110_Text_1F08E3, 3 + msgbox Route110_Text_1F08E3, MSGBOX_SIGN end Route110_EventScript_1EF36E:: @ 81EF36E - msgbox Route110_Text_1F08F3, 3 + msgbox Route110_Text_1F08F3, MSGBOX_SIGN end Route110_EventScript_1EF377:: @ 81EF377 - msgbox Route110_Text_1F090D, 3 + msgbox Route110_Text_1F090D, MSGBOX_SIGN end Route110_EventScript_1EF380:: @ 81EF380 - msgbox Route110_Text_1F0992, 3 + msgbox Route110_Text_1F0992, MSGBOX_SIGN end Route110_EventScript_1EF389:: @ 81EF389 - msgbox Route110_Text_1F09DB, 3 + msgbox Route110_Text_1F09DB, MSGBOX_SIGN end Route110_EventScript_1EF392:: @ 81EF392 @@ -133,12 +133,12 @@ Route110_EventScript_1EF392:: @ 81EF392 specialvar VAR_RESULT, GetRecordedCyclingRoadResults compare VAR_RESULT, 0 goto_eq Route110_EventScript_1EF3AD - msgbox Route110_Text_1F0A1E, 4 + msgbox Route110_Text_1F0A1E, MSGBOX_DEFAULT releaseall end Route110_EventScript_1EF3AD:: @ 81EF3AD - msgbox Route110_Text_1F0A5E, 4 + msgbox Route110_Text_1F0A5E, MSGBOX_DEFAULT releaseall end @@ -150,171 +150,159 @@ Route110_EventScript_1EF3B7:: @ 81EF3B7 goto_eq Route110_EventScript_1EF3E8 compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_eq Route110_EventScript_1EF3DE - msgbox Route110_Text_1F06FB, 4 + msgbox Route110_Text_1F06FB, MSGBOX_DEFAULT release end Route110_EventScript_1EF3DE:: @ 81EF3DE - msgbox Route110_Text_1F0661, 4 + msgbox Route110_Text_1F0661, MSGBOX_DEFAULT release end Route110_EventScript_1EF3E8:: @ 81EF3E8 - msgbox Route110_Text_1F0755, 4 + msgbox Route110_Text_1F0755, MSGBOX_DEFAULT release end Route110_EventScript_1EF3F2:: @ 81EF3F2 - trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_29802B, Route110_Text_298064 - msgbox Route110_Text_29808A, 6 + trainerbattle_single TRAINER_EDWARD, Route110_Text_29802B, Route110_Text_298064 + msgbox Route110_Text_29808A, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF409:: @ 81EF409 - trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_2980B9, Route110_Text_2980E5 - msgbox Route110_Text_2980F8, 6 + trainerbattle_single TRAINER_JACLYN, Route110_Text_2980B9, Route110_Text_2980E5 + msgbox Route110_Text_2980F8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF420:: @ 81EF420 - trainerbattle 2, TRAINER_EDWIN_1, 0, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C + trainerbattle_single TRAINER_EDWIN_1, Route110_Text_29815E, Route110_Text_29818F, Route110_EventScript_1EF44C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF46B - msgbox Route110_Text_2981B3, 4 + msgbox Route110_Text_2981B3, MSGBOX_DEFAULT release end Route110_EventScript_1EF44C:: @ 81EF44C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_298201, 4 - setvar VAR_0x8004, 512 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 512 - callstd 8 + msgbox Route110_Text_298201, MSGBOX_DEFAULT + register_matchcall TRAINER_EDWIN_1 release end Route110_EventScript_1EF46B:: @ 81EF46B - trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_298232, Route110_Text_298288 - msgbox Route110_Text_2982A2, 6 + trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_298232, Route110_Text_298288 + msgbox Route110_Text_2982A2, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF482:: @ 81EF482 - trainerbattle 0, TRAINER_DALE, 0, Route110_Text_2982CC, Route110_Text_2982F5 - msgbox Route110_Text_298303, 6 + trainerbattle_single TRAINER_DALE, Route110_Text_2982CC, Route110_Text_2982F5 + msgbox Route110_Text_298303, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF499:: @ 81EF499 - trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_297B3F, Route110_Text_297B77 - msgbox Route110_Text_297B8F, 6 + trainerbattle_single TRAINER_JACOB, Route110_Text_297B3F, Route110_Text_297B77 + msgbox Route110_Text_297B8F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4B0:: @ 81EF4B0 - trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_297BE7, Route110_Text_297C0F - msgbox Route110_Text_297C1F, 6 + trainerbattle_single TRAINER_ANTHONY, Route110_Text_297BE7, Route110_Text_297C0F + msgbox Route110_Text_297C1F, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF4C7:: @ 81EF4C7 - trainerbattle 2, TRAINER_BENJAMIN_1, 0, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 + trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_297C63, Route110_Text_297C8A, Route110_EventScript_1EF4F3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF512 - msgbox Route110_Text_297CB4, 4 + msgbox Route110_Text_297CB4, MSGBOX_DEFAULT release end Route110_EventScript_1EF4F3:: @ 81EF4F3 special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297CFE, 4 - setvar VAR_0x8004, 353 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 353 - callstd 8 + msgbox Route110_Text_297CFE, MSGBOX_DEFAULT + register_matchcall TRAINER_BENJAMIN_1 release end Route110_EventScript_1EF512:: @ 81EF512 - trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_297D4B, Route110_Text_297D8E - msgbox Route110_Text_297DB0, 6 + trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_297D4B, Route110_Text_297D8E + msgbox Route110_Text_297DB0, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF529:: @ 81EF529 - trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_297F93, Route110_Text_297FD0 - msgbox Route110_Text_297FF1, 6 + trainerbattle_single TRAINER_JASMINE, Route110_Text_297F93, Route110_Text_297FD0 + msgbox Route110_Text_297FF1, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF540:: @ 81EF540 - trainerbattle 2, TRAINER_ABIGAIL_1, 0, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C + trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_297DFA, Route110_Text_297E69, Route110_EventScript_1EF56C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF58B - msgbox Route110_Text_297E88, 4 + msgbox Route110_Text_297E88, MSGBOX_DEFAULT release end Route110_EventScript_1EF56C:: @ 81EF56C special sub_80B4808 waitmovement 0 - msgbox Route110_Text_297ECD, 4 - setvar VAR_0x8004, 358 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 358 - callstd 8 + msgbox Route110_Text_297ECD, MSGBOX_DEFAULT + register_matchcall TRAINER_ABIGAIL_1 release end Route110_EventScript_1EF58B:: @ 81EF58B - trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_297F09, Route110_Text_297F37 - msgbox Route110_Text_297F58, 6 + trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_297F09, Route110_Text_297F37 + msgbox Route110_Text_297F58, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF5A2:: @ 81EF5A2 - trainerbattle 2, TRAINER_ISABEL_1, 0, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE + trainerbattle_single TRAINER_ISABEL_1, Route110_Text_298349, Route110_Text_298389, Route110_EventScript_1EF5CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route110_EventScript_1EF5ED - msgbox Route110_Text_2983A2, 4 + msgbox Route110_Text_2983A2, MSGBOX_DEFAULT release end Route110_EventScript_1EF5CE:: @ 81EF5CE special sub_80B4808 waitmovement 0 - msgbox Route110_Text_2983EE, 4 - setvar VAR_0x8004, 302 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 302 - callstd 8 + msgbox Route110_Text_2983EE, MSGBOX_DEFAULT + register_matchcall TRAINER_ISABEL_1 release end Route110_EventScript_1EF5ED:: @ 81EF5ED - trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_298466, Route110_Text_2984AF - msgbox Route110_Text_2984C8, 6 + trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_298466, Route110_Text_2984AF + msgbox Route110_Text_2984C8, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF604:: @ 81EF604 - trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_298525, Route110_Text_298559 - msgbox Route110_Text_298579, 6 + trainerbattle_single TRAINER_TIMMY, Route110_Text_298525, Route110_Text_298559 + msgbox Route110_Text_298579, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF61B:: @ 81EF61B end Route110_EventScript_1EF61C:: @ 81EF61C - trainerbattle 0, TRAINER_KALEB, 0, Route110_Text_2986ED, Route110_Text_298735 - msgbox Route110_Text_298755, 6 + trainerbattle_single TRAINER_KALEB, Route110_Text_2986ED, Route110_Text_298735 + msgbox Route110_Text_298755, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF633:: @ 81EF633 - trainerbattle 0, TRAINER_JOSEPH, 0, Route110_Text_298642, Route110_Text_298686 - msgbox Route110_Text_2986A9, 6 + trainerbattle_single TRAINER_JOSEPH, Route110_Text_298642, Route110_Text_298686 + msgbox Route110_Text_2986A9, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF64A:: @ 81EF64A - trainerbattle 0, TRAINER_ALYSSA, 0, Route110_Text_2985AB, Route110_Text_2985F9 - msgbox Route110_Text_298612, 6 + trainerbattle_single TRAINER_ALYSSA, Route110_Text_2985AB, Route110_Text_2985F9 + msgbox Route110_Text_298612, MSGBOX_AUTOCLOSE end Route110_EventScript_1EF661:: @ 81EF661 @@ -327,7 +315,7 @@ Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF673:: @ 81EF673 special FinishCyclingRoadChallenge - msgbox Route110_Text_1F03FF, 4 + msgbox Route110_Text_1F03FF, MSGBOX_DEFAULT switch VAR_RESULT case 10, Route110_EventScript_1EF6FD case 9, Route110_EventScript_1EF70B @@ -343,27 +331,27 @@ Route110_EventScript_1EF673:: @ 81EF673 end Route110_EventScript_1EF6FD:: @ 81EF6FD - msgbox Route110_Text_1F0431, 4 + msgbox Route110_Text_1F0431, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF70B:: @ 81EF70B - msgbox Route110_Text_1F04A4, 4 + msgbox Route110_Text_1F04A4, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF719:: @ 81EF719 - msgbox Route110_Text_1F0500, 4 + msgbox Route110_Text_1F0500, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF727:: @ 81EF727 - msgbox Route110_Text_1F0567, 4 + msgbox Route110_Text_1F0567, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end Route110_EventScript_1EF735:: @ 81EF735 - msgbox Route110_Text_1F05CE, 4 + msgbox Route110_Text_1F05CE, MSGBOX_DEFAULT goto Route110_EventScript_1EF743 end @@ -425,7 +413,7 @@ Route110_EventScript_1EF7E6:: @ 81EF7E6 return Route110_EventScript_1EF7EB:: @ 81EF7EB - msgbox Route110_Text_1EFC48, 4 + msgbox Route110_Text_1EFC48, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF81A case 1, Route110_EventScript_1EF82A @@ -433,29 +421,29 @@ Route110_EventScript_1EF7EB:: @ 81EF7EB end Route110_EventScript_1EF81A:: @ 81EF81A - trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF82A:: @ 81EF82A - trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF83A:: @ 81EF83A - trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_1EFCCB + trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_1EFCCB goto Route110_EventScript_1EF84A end Route110_EventScript_1EF84A:: @ 81EF84A - msgbox Route110_Text_1EFCF1, 4 + msgbox Route110_Text_1EFCF1, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFD58, 4 + msgbox Route110_Text_1EFD58, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end Route110_EventScript_1EF865:: @ 81EF865 - msgbox Route110_Text_1EFE3F, 4 + msgbox Route110_Text_1EFE3F, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route110_EventScript_1EF894 case 1, Route110_EventScript_1EF8A4 @@ -463,24 +451,24 @@ Route110_EventScript_1EF865:: @ 81EF865 end Route110_EventScript_1EF894:: @ 81EF894 - trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8A4:: @ 81EF8A4 - trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8B4:: @ 81EF8B4 - trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_1EFEB4 + trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_1EFEB4 goto Route110_EventScript_1EF8C4 end Route110_EventScript_1EF8C4:: @ 81EF8C4 - msgbox Route110_Text_1EFECD, 4 + msgbox Route110_Text_1EFECD, MSGBOX_DEFAULT call Route110_EventScript_1EF8DF - msgbox Route110_Text_1EFF1C, 4 + msgbox Route110_Text_1EFF1C, MSGBOX_DEFAULT goto Route110_EventScript_1EF8EC end @@ -640,7 +628,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 call_if 1, Route110_EventScript_1EFAEE compare VAR_0x8008, 4 call_if 1, Route110_EventScript_1EFAF9 - msgbox Route110_Text_1F0AB5, 4 + msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT closemessage delay 20 applymovement 36, Route110_Movement_2725A4 @@ -652,16 +640,16 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 applymovement 36, Route110_Movement_2725AA waitmovement 0 delay 30 - msgbox Route110_Text_1F0AFF, 4 + msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route110_Text_1F0C0C, 4 + msgbox Route110_Text_1F0C0C, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x119 - msgbox Route110_Text_1F0C33, 4 + msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 call_if 1, Route110_EventScript_1EFB04 @@ -780,8 +768,8 @@ Route110_Movement_1EFB57: @ 81EFB57 step_end Route110_Text_1EFB5D: @ 81EFB5D - .string "TEAM AQUA’s activities…\n" - .string "We can’t talk about them yet.$" + .string "TEAM AQUA's activities…\n" + .string "We can't talk about them yet.$" Route110_Text_1EFB93: @ 81EFB93 .string "I want to get going to SLATEPORT and\n" @@ -789,11 +777,11 @@ Route110_Text_1EFB93: @ 81EFB93 Route110_Text_1EFBCA: @ 81EFBCA .string "This is my first job after joining\n" - .string "TEAM AQUA. It’s a little scary.$" + .string "TEAM AQUA. It's a little scary.$" Route110_Text_1EFC0D: @ 81EFC0D - .string "TEAM AQUA’s actions should bring\n" - .string "smiles to people’s faces!$" + .string "TEAM AQUA's actions should bring\n" + .string "smiles to people's faces!$" Route110_Text_1EFC48: @ 81EFC48 .string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p" @@ -804,51 +792,51 @@ Route110_Text_1EFC48: @ 81EFC48 Route110_Text_1EFCCB: @ 81EFCCB .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" Route110_Text_1EFCF1: @ 81EFCF1 - .string "MAY: {PLAYER}{KUN}, you’ve been busy\n" - .string "training, too, haven’t you?\p" + .string "MAY: {PLAYER}{KUN}, you've been busy\n" + .string "training, too, haven't you?\p" .string "I think you deserve a reward!\n" .string "This is from me!$" Route110_Text_1EFD58: @ 81EFD58 - .string "MAY: That’s an ITEMFINDER.\p" - .string "Try it out. If there is an item that’s\n" + .string "MAY: That's an ITEMFINDER.\p" + .string "Try it out. If there is an item that's\n" .string "not visible, it emits a sound.\p" - .string "Okay, {PLAYER}{KUN}, let’s meet again!\p" - .string "I know it’s a little silly coming from\n" + .string "Okay, {PLAYER}{KUN}, let's meet again!\p" + .string "I know it's a little silly coming from\n" .string "me, but I think you should train a lot\l" .string "harder for the next time.$" Route110_Text_1EFE3F: @ 81EFE3F .string "BRENDAN: Hey, {PLAYER}.\n" .string "So this is where you were.\l" - .string "How’s it going?\p" + .string "How's it going?\p" .string "Have you been raising your POKéMON?\n" - .string "I’ll check for you.$" + .string "I'll check for you.$" Route110_Text_1EFEB4: @ 81EFEB4 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" Route110_Text_1EFECD: @ 81EFECD - .string "BRENDAN: {PLAYER}, you’ve trained\n" + .string "BRENDAN: {PLAYER}, you've trained\n" .string "without me noticing…\p" .string "Good enough!\n" .string "Here, take this.$" Route110_Text_1EFF1C: @ 81EFF1C - .string "BRENDAN: That’s an ITEMFINDER.\p" + .string "BRENDAN: That's an ITEMFINDER.\p" .string "Use it to root around for items that\n" - .string "aren’t visible.\p" + .string "aren't visible.\p" .string "If it senses something, it emits\n" .string "a sound.\p" - .string "Anyway, I’m off to look for new\n" + .string "Anyway, I'm off to look for new\n" .string "POKéMON.$" Route110_Text_1EFFC3: @ 81EFFC3 - .string "Wouldn’t it be great to ride a BIKE\n" + .string "Wouldn't it be great to ride a BIKE\n" .string "at full speed on CYCLING ROAD?$" Route110_Text_1F0006: @ 81F0006 @@ -858,7 +846,7 @@ Route110_Text_1F0006: @ 81F0006 Route110_Text_1F006A: @ 81F006A .string "Oh, hey, you got that BIKE from RYDEL!\p" - .string "Oh, it’s glaringly obvious.\n" + .string "Oh, it's glaringly obvious.\n" .string "It says right on your bike…\p" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" @@ -869,9 +857,9 @@ Route110_Text_1F006A: @ 81F006A .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\n" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL,\p" .string "RYDEL, RYDEL, RYDEL, RYDEL, RYDEL…\n" - .string "That name’s everywhere.\p" + .string "That name's everywhere.\p" .string "You should ride it around all over\n" - .string "the place--it’s good advertising!$" + .string "the place--it's good advertising!$" Route110_Text_1F0261: @ 81F0261 .string "The two roads, one above, one below…\p" @@ -879,7 +867,7 @@ Route110_Text_1F0261: @ 81F0261 .string "Perhaps that is right and fair.$" Route110_Text_1F02CA: @ 81F02CA - .string "I don’t have a BIKE, so I’ll take\n" + .string "I don't have a BIKE, so I'll take\n" .string "a leisurely walk on the low road.$" Route110_Text_1F030E: @ 81F030E @@ -904,7 +892,7 @@ Route110_Text_1F0431: @ 81F0431 .string "Bravo! Splendid showing!\p" .string "Your love of cycling comes from deep\n" .string "within your heart.\l" - .string "You’ve shaken me to my very soul!$" + .string "You've shaken me to my very soul!$" Route110_Text_1F04A4: @ 81F04A4 .string "Your technique is remarkable.\p" @@ -914,7 +902,7 @@ Route110_Text_1F04A4: @ 81F04A4 Route110_Text_1F0500: @ 81F0500 .string "I would consider you a work in\n" .string "progress.\p" - .string "Still, I hope you don’t forget the\n" + .string "Still, I hope you don't forget the\n" .string "sheer pleasure of cycling.$" Route110_Text_1F0567: @ 81F0567 @@ -925,7 +913,7 @@ Route110_Text_1F0567: @ 81F0567 Route110_Text_1F05CE: @ 81F05CE .string "…I am aghast…\p" - .string "You’re perhaps not cut out for this\n" + .string "You're perhaps not cut out for this\n" .string "unfortunate cycling business.\p" .string "You ought to give serious thought to\n" .string "returning that BIKE to RYDEL.$" @@ -947,7 +935,7 @@ Route110_Text_1F0755: @ 81F0755 .string "MACH BIKES are rated for their number\l" .string "of collisions and their total times.\p" .string "ACRO BIKES do not qualify for rating.\n" - .string "They are easy to turn, so it’s not fair.$" + .string "They are easy to turn, so it's not fair.$" Route110_Text_1F0812: @ 81F0812 .string "ROUTE 110\n" @@ -1008,12 +996,12 @@ Route110_Text_1F0AB5: @ 81F0AB5 Route110_Text_1F0AFF: @ 81F0AFF .string "Oh, I see!\n" .string "You two are running separately.\l" - .string "Well, that’s fine.\p" + .string "Well, that's fine.\p" .string "Oh, yes, I heard that your POKéNAV\n" .string "had the MATCH CALL system installed.\p" .string "Well, then, I should register you in\n" .string "my POKéNAV as well.\p" - .string "That way, even when we’re apart,\n" + .string "That way, even when we're apart,\n" .string "I can rate your POKéDEX anytime.\p" .string "… … … … … …$" diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index cbb5070a2..ee859748f 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -4,7 +4,7 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 lock faceplayer - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, MSGBOX_DEFAULT release end @@ -19,7 +19,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4 + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 waitmovement 0 @@ -39,12 +39,12 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" + .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" + .string "Sorry, you can't walk on CYCLING\n" + .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index b38bbf896..9bd6c845e 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -16,7 +16,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 lock faceplayer - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 return Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4 + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, MSGBOX_DEFAULT closemessage applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 waitmovement 0 @@ -58,12 +58,12 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" + .string "and cycle as fast as you'd like.\p" .string "It feels great to go that fast, but try\n" .string "not to crash into anyone!$" Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" + .string "Sorry, you can't walk on CYCLING\n" + .string "ROAD. It's too dangerous.\p" .string "Please come back with a BIKE.$" diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 4e15ddbe7..892d9e65f 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -43,7 +43,7 @@ Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 lock faceplayer - msgbox Route110_TrickHouseEnd_Text_26B08D, 4 + msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT setvar VAR_TEMP_2, 1 switch VAR_0x4044 case 0, Route110_TrickHouseEnd_EventScript_26AD84 @@ -57,98 +57,98 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17 end Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84 - msgbox Route110_TrickHouseEnd_Text_26B0BC, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_RARE_CANDY compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0 - msgbox Route110_TrickHouseEnd_Text_26B13B, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TIMER_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC - msgbox Route110_TrickHouseEnd_Text_26B1AD, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_HARD_STONE compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38 - msgbox Route110_TrickHouseEnd_Text_26B223, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_SMOKE_BALL compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74 - msgbox Route110_TrickHouseEnd_Text_26B293, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_TM12 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0 - msgbox Route110_TrickHouseEnd_Text_26B315, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_MAGNET compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC - msgbox Route110_TrickHouseEnd_Text_26B365, 4 - msgbox Route110_TrickHouseEnd_Text_26B73D, 4 + msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT + msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 giveitem_std ITEM_PP_MAX compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26AFEF - msgbox Route110_TrickHouseEnd_Text_26B7EF, 4 + msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT closemessage call Route110_TrickHouseEnd_EventScript_26AFCF release end Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 - msgbox Route110_TrickHouseEnd_Text_26B3AB, 4 + msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_26B015 @@ -159,17 +159,17 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 compare VAR_FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_26B036 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B3FA, 4 + msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEnd_Movement_27259E waitmovement 0 delay 30 - msgbox Route110_TrickHouseEnd_Text_26B485, 4 + msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT setvar VAR_0x40C1, 0 call Route110_TrickHouseEnd_EventScript_26AFA5 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_26B002 - msgbox Route110_TrickHouseEnd_Text_26B69A, 4 + msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT call Route110_TrickHouseEnd_EventScript_26AFCF special ResetTrickHouseEndRoomFlag release @@ -201,13 +201,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF call Route110_TrickHouseEnd_EventScript_27205E - msgbox Route110_TrickHouseEnd_Text_26B760, 4 + msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002 call Route110_TrickHouseEnd_EventScript_272071 - msgbox Route110_TrickHouseEnd_Text_26B615, 4 + msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT setvar VAR_0x40C1, 1 return @@ -243,7 +243,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_2725AA waitmovement 0 - msgbox Route110_TrickHouseEnd_Text_26B8BD, 4 + msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT closemessage applymovement 255, Route110_TrickHouseEnd_Movement_26B089 waitmovement 0 @@ -262,50 +262,50 @@ Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B Route110_TrickHouseEnd_Text_26B08D: @ 826B08D .string "Aak!\n" - .string "You’ve made it to me?\l" - .string "Hmmm… You’re sharp!$" + .string "You've made it to me?\l" + .string "Hmmm… You're sharp!$" Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC .string "It took me all night to plant all those\n" .string "trees…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five, six places!$" Route110_TrickHouseEnd_Text_26B13B: @ 826B13B .string "It took me all night to make the maze…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four, five places!$" Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD .string "It took me all night to prepare\n" .string "the wall panels…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three, four places!$" Route110_TrickHouseEnd_Text_26B223: @ 826B223 .string "It took me all night to shove in those\n" .string "boulders…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two, three places!$" Route110_TrickHouseEnd_Text_26B293: @ 826B293 .string "It took me all night to make MECHADOLLS\n" .string "and another to think up the quiz…\p" - .string "You’re almost my equal in greatness by\n" + .string "You're almost my equal in greatness by\n" .string "one, two places!$" Route110_TrickHouseEnd_Text_26B315: @ 826B315 .string "It took me all night to install\n" .string "the doors…\p" - .string "You’re almost my equal in greatness!$" + .string "You're almost my equal in greatness!$" Route110_TrickHouseEnd_Text_26B365: @ 826B365 .string "It took me all night setting up arrows…\p" - .string "You’re my equal in greatness!$" + .string "You're my equal in greatness!$" Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB .string "It took me all night polishing floors…\p" - .string "You’re above me in greatness!\n" + .string "You're above me in greatness!\n" .string "Possibly…$" Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA @@ -352,18 +352,18 @@ Route110_TrickHouseEnd_Text_26B73D: @ 826B73D Route110_TrickHouseEnd_Text_26B760: @ 826B760 .string "What? Have you no room for this?\n" .string "What manner of items do you carry?\p" - .string "But fine, since you’ve reached me,\n" + .string "But fine, since you've reached me,\n" .string "your reward will be with me till later.$" Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF .string "Scrub that smug smirk from your face!\n" - .string "It’s much too early to think you’ve won!\p" - .string "I’ll make new tricks to stump you, I will.\n" - .string "You may mock me only when you’re done.\p" + .string "It's much too early to think you've won!\p" + .string "I'll make new tricks to stump you, I will.\n" + .string "You may mock me only when you're done.\p" .string "Come back for the next exciting\n" .string "installment!$" Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD - .string "Now, now! You’re ignoring me now?\n" + .string "Now, now! You're ignoring me now?\n" .string "Now that, I consider heartbreaking!$" diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 859a28d6a..22750f536 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -214,7 +214,7 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8 delay 20 compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_269E48 - msgbox Route110_TrickHouseEntrance_Text_26A78C, 4 + msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT closemessage delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_269E36 @@ -271,35 +271,35 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E end Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE - msgbox Route110_TrickHouseEntrance_Text_26A48A, 4 + msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7 - msgbox Route110_TrickHouseEntrance_Text_26A4DA, 4 + msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00 - msgbox Route110_TrickHouseEntrance_Text_26A529, 4 + msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09 - msgbox Route110_TrickHouseEntrance_Text_26A577, 4 + msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12 - msgbox Route110_TrickHouseEntrance_Text_26A5C8, 4 + msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B - msgbox Route110_TrickHouseEntrance_Text_26A616, 4 + msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24 - msgbox Route110_TrickHouseEntrance_Text_26A665, 4 + msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D - msgbox Route110_TrickHouseEntrance_Text_26A6B6, 4 + msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT return Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 @@ -327,11 +327,11 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 - msgbox Route110_TrickHouseEntrance_Text_26A709, 4 + msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT return Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 - msgbox Route110_TrickHouseEntrance_Text_26A921, 4 + msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 @@ -340,7 +340,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_27259A waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26A9AF, 4 + msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6 waitmovement 0 releaseall @@ -349,7 +349,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51 Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AA82, 4 + msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT compare VAR_0x4044, 1 goto_eq Route110_TrickHouseEntrance_EventScript_269EEF compare VAR_0x4044, 2 @@ -372,7 +372,7 @@ Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -382,7 +382,7 @@ Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -392,7 +392,7 @@ Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -402,7 +402,7 @@ Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -412,7 +412,7 @@ Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -422,7 +422,7 @@ Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7 goto_eq Route110_TrickHouseEntrance_EventScript_26A023 compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_27205E - msgbox Route110_TrickHouseEntrance_Text_26AB00, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT releaseall end @@ -447,13 +447,13 @@ Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039 applymovement 1, Route110_TrickHouseEntrance_Movement_27259E waitmovement 0 - msgbox Route110_TrickHouseEntrance_Text_26AB2C, 4 + msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT call Route110_TrickHouseEntrance_EventScript_26A070 compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A09A compare VAR_RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_272071 - msgbox Route110_TrickHouseEntrance_Text_26ABBD, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT releaseall end @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092 return Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A - msgbox Route110_TrickHouseEntrance_Text_26ABAE, 4 + msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_26D632 waitmovement 0 @@ -497,12 +497,12 @@ Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3 end Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110 - msgbox Route110_TrickHouseEntrance_Text_26A887, 5 + msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO closemessage compare VAR_RESULT, 1 goto_eq Route110_TrickHouseEntrance_EventScript_26A126 @@ -581,19 +581,19 @@ Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6 end Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B compare VAR_0x4044, 8 goto_eq Route110_TrickHouseEntrance_EventScript_26A220 - msgbox Route110_TrickHouseEntrance_Text_26A878, 4 + msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220 - msgbox Route110_TrickHouseEntrance_Text_26A8BD, 4 + msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT releaseall end @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 compare VAR_0x40AB, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle1_Text_26B98D, 4 + msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AB, 2 setmetatile 13, 1, 523, 0 @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 compare VAR_0x40AC, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle2_Text_26BCBA, 4 + msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AC, 2 setmetatile 13, 1, 523, 0 @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB compare VAR_0x40AD, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle3_Text_26C609, 4 + msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AD, 2 setmetatile 13, 1, 523, 0 @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 compare VAR_0x40AE, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle4_Text_26C8C3, 4 + msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AE, 2 setmetatile 13, 1, 523, 0 @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D compare VAR_0x40AF, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle5_Text_26D660, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40AF, 2 setmetatile 13, 1, 523, 0 @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 compare VAR_0x40B0, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle6_Text_26DE26, 4 + msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B0, 2 setmetatile 13, 1, 523, 0 @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F compare VAR_0x40B1, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle7_EventScript_26E413, 4 + msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B1, 2 setmetatile 13, 1, 523, 0 @@ -690,7 +690,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 compare VAR_0x40B2, 0 goto_eq Route110_TrickHouseEntrance_EventScript_26A3D1 - msgbox Route110_TrickHousePuzzle8_EventScript_26E864, 4 + msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT playse SE_PIN setvar VAR_0x40B2, 2 setmetatile 13, 1, 523, 0 @@ -699,7 +699,7 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8 end Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1 - msgbox Route110_TrickHouseEntrance_Text_26AC4F, 4 + msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT releaseall end @@ -711,7 +711,7 @@ Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB - msgbox Route110_TrickHousePuzzle1_Text_26AC2F, 4 + msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT releaseall end @@ -726,13 +726,13 @@ Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5 playfanfare MUS_FANFA4 message Route110_TrickHousePuzzle1_Text_26ABE8 waitfanfare - msgbox Route110_TrickHousePuzzle1_Text_26ABFB, 4 + msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT releaseall end Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8 lockall - msgbox Route110_TrickHouseEntrance_Text_26A474, 4 + msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT releaseall compare VAR_0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_26A429 @@ -772,47 +772,47 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 return Route110_TrickHouseEntrance_Text_26A474: @ 826A474 - .string "You’re being watched…$" + .string "You're being watched…$" Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beneath this desk? You’re sharp!$" + .string "beneath this desk? You're sharp!$" Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "behind this tree? You’re sharp!$" + .string "behind this tree? You're sharp!$" Route110_TrickHouseEntrance_Text_26A529: @ 826A529 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this dresser? You’re sharp!$" + .string "in this dresser? You're sharp!$" Route110_TrickHouseEntrance_Text_26A577: @ 826A577 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beyond this window? You’re sharp!$" + .string "beyond this window? You're sharp!$" Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this planter? You’re sharp!$" + .string "in this planter? You're sharp!$" Route110_TrickHouseEntrance_Text_26A616: @ 826A616 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "in this cupboard? You’re sharp!$" + .string "in this cupboard? You're sharp!$" Route110_TrickHouseEntrance_Text_26A665: @ 826A665 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "behind this window? You’re sharp!$" + .string "behind this window? You're sharp!$" Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6 .string "Hah? Grrr…\p" .string "How did you know I concealed myself\n" - .string "beneath this cushion? You’re sharp!$" + .string "beneath this cushion? You're sharp!$" Route110_TrickHouseEntrance_Text_26A709: @ 826A709 .string "Behold!\p" @@ -823,9 +823,9 @@ Route110_TrickHouseEntrance_Text_26A709: @ 826A709 .string "Wahahaha! Glad to meet you!$" Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C - .string "You, you’ve come to challenge\n" - .string "my TRICK HOUSE, haven’t you?\p" - .string "That’s why you’re here, isn’t it?\n" + .string "You, you've come to challenge\n" + .string "my TRICK HOUSE, haven't you?\p" + .string "That's why you're here, isn't it?\n" .string "Yes, it is!\p" .string "Consider your challenge accepted!\p" .string "Enter through the scroll there,\n" @@ -833,7 +833,7 @@ Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C .string "I shall be waiting in the back!$" Route110_TrickHouseEntrance_Text_26A878: @ 826A878 - .string "It’s a scroll.$" + .string "It's a scroll.$" Route110_TrickHouseEntrance_Text_26A887: @ 826A887 .string "There is a big hole behind the scroll!\p" @@ -842,30 +842,30 @@ Route110_TrickHouseEntrance_Text_26A887: @ 826A887 Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD .string "There is a note affixed to the scroll…\p" .string "“I am leaving on a journey.\n" - .string "Don’t look for me. TRICK MASTER”$" + .string "Don't look for me. TRICK MASTER”$" Route110_TrickHouseEntrance_Text_26A921: @ 826A921 - .string "For the next time, I’ll use this trick,\n" + .string "For the next time, I'll use this trick,\n" .string "and that scheme, and those ruses…\p" - .string "Mufufufu… If I may say so, it’s\n" + .string "Mufufufu… If I may say so, it's\n" .string "brilliantly difficult, even for me!$" Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF .string "Hah? What?!\n" - .string "Oh, it’s you!\p" - .string "I’m in the midst of devising new tricky\n" + .string "Oh, it's you!\p" + .string "I'm in the midst of devising new tricky\n" .string "challenges!\p" - .string "It’s not too much to ask for a bit more\n" + .string "It's not too much to ask for a bit more\n" .string "time for me to think, is it now?\l" - .string "You wouldn’t begrudge me that?\l" + .string "You wouldn't begrudge me that?\l" .string "Come back in a little while!$" Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82 - .string "Ah, it’s you! You’re here to accept the\n" - .string "reward from before, isn’t that right?\l" + .string "Ah, it's you! You're here to accept the\n" + .string "reward from before, isn't that right?\l" .string "Yes, right I am!\p" .string "Here!\n" - .string "I’ll give it to you now!$" + .string "I'll give it to you now!$" Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00 .string "Hah?\n" diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index 340a7e03c..036521ee4 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,18 +24,18 @@ Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D end Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948 - trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F - msgbox Route110_TrickHousePuzzle1_Text_26BA57, 6 + trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F + msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F - trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 - msgbox Route110_TrickHousePuzzle1_Text_26BAC3, 6 + trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0 + msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976 - trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E - msgbox Route110_TrickHousePuzzle1_Text_26BB52, 6 + trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E + msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D @@ -46,7 +46,7 @@ Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D .string "The lock clicked open!$" Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB - .string "I’ll hack and slash my way to victory\n" + .string "I'll hack and slash my way to victory\n" .string "with the CUT we just learned!$" Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F @@ -61,11 +61,11 @@ Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82 .string "by accident…$" Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0 - .string "And now I’ve lost…$" + .string "And now I've lost…$" Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3 - .string "I lost my way, I lost a battle, and I’m\n" - .string "now even more lost… I can’t get out…$" + .string "I lost my way, I lost a battle, and I'm\n" + .string "now even more lost… I can't get out…$" Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10 .string "Just who is the TRICK MASTER?$" @@ -74,6 +74,6 @@ Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E .string "I lost while I was lost in thought!$" Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52 - .string "You’re strong!\n" + .string "You're strong!\n" .string "Just who are you?$" diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index b724b986d..60c7cdbce 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,18 +90,18 @@ Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62 return Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75 - trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 - msgbox Route110_TrickHousePuzzle2_Text_26BD70, 6 + trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45 + msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C - trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF - msgbox Route110_TrickHousePuzzle2_Text_26BDEC, 6 + trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF + msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3 - trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 - msgbox Route110_TrickHousePuzzle2_Text_26BE97, 6 + trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77 + msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA @@ -115,7 +115,7 @@ Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25 .string "Which switch closes which hole?$" Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45 - .string "After that battle, I’m even more\n" + .string "After that battle, I'm even more\n" .string "confused!$" Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 @@ -123,11 +123,11 @@ Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70 .string "for me?$" Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E - .string "Oh! You’re on your second TRICK HOUSE\n" + .string "Oh! You're on your second TRICK HOUSE\n" .string "challenge!$" Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF - .string "You’re good at battling too?$" + .string "You're good at battling too?$" Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC .string "The TRICK MASTER rigged all the tricks\n" @@ -135,12 +135,12 @@ Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31 .string "I want to make my own GYM one day.\n" - .string "So, I’m studying how to set traps.$" + .string "So, I'm studying how to set traps.$" Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77 - .string "I didn’t study battling enough!$" + .string "I didn't study battling enough!$" Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97 - .string "You’re strong, aren’t you?\n" + .string "You're strong, aren't you?\n" .string "Maybe even enough to be a GYM LEADER!$" diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 9956f9889..cadb6315a 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -302,18 +302,18 @@ Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9 end Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4 - trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D - msgbox Route110_TrickHousePuzzle3_Text_26C6E6, 6 + trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D + msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB - trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 - msgbox Route110_TrickHousePuzzle3_Text_26C776, 6 + trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763 + msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2 - trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC - msgbox Route110_TrickHousePuzzle3_Text_26C80C, 6 + trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC + msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle3_Text_26C609: @ 826C609 @@ -327,34 +327,34 @@ Route110_TrickHousePuzzle3_Text_26C676: @ 826C676 .string "I keep coming back to this same place!$" Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D - .string "I’m already having trouble, and then\n" - .string "you have to beat me? It’s not fair!$" + .string "I'm already having trouble, and then\n" + .string "you have to beat me? It's not fair!$" Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6 - .string "It’s full of doors here!\n" - .string "It’s too small and dark in here! Help!$" + .string "It's full of doors here!\n" + .string "It's too small and dark in here! Help!$" Route110_TrickHousePuzzle3_Text_26C726: @ 826C726 - .string "I don’t know what’s going on here.\n" - .string "I’m starting to feel sad…$" + .string "I don't know what's going on here.\n" + .string "I'm starting to feel sad…$" Route110_TrickHousePuzzle3_Text_26C763: @ 826C763 - .string "You… You’re awful!$" + .string "You… You're awful!$" Route110_TrickHousePuzzle3_Text_26C776: @ 826C776 - .string "I know I’m weak!\n" + .string "I know I'm weak!\n" .string "And, I have no sense of direction!$" Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA - .string "I don’t get it. What would anyone want\n" + .string "I don't get it. What would anyone want\n" .string "with a house this bizarre?$" Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC - .string "I don’t get it.\n" + .string "I don't get it.\n" .string "How did I lose?$" Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C - .string "I don’t get it.\n" + .string "I don't get it.\n" .string "How many traps are in this house?\p" .string "You may be the one to solve that.$" diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 56b4b02fb..3d1004b1c 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,18 +14,18 @@ Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873 end Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E - trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E - msgbox Route110_TrickHousePuzzle4_Text_26C9A2, 6 + trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E + msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895 - trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 - msgbox Route110_TrickHousePuzzle4_Text_26CA53, 6 + trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20 + msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC - trainerbattle 0, TRAINER_PAULA, 0, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB - msgbox Route110_TrickHousePuzzle4_Text_26CAD1, 6 + trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB + msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3 .string "The lock clicked open!$" Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D - .string "It’s too much bother to think this out.\n" + .string "It's too much bother to think this out.\n" .string "I only wanted to battle!$" Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E .string "the best!$" Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2 - .string "Wouldn’t you agree? You would go\n" + .string "Wouldn't you agree? You would go\n" .string "anywhere if TRAINERS were there.$" Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 @@ -52,16 +52,16 @@ Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4 .string "aside with one finger!$" Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20 - .string "I can push boulders, but I can’t solve\n" + .string "I can push boulders, but I can't solve\n" .string "the puzzle…$" Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53 - .string "It’s not good enough to be brawny…\n" + .string "It's not good enough to be brawny…\n" .string "You have to use your head. Be brainy!$" Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C .string "The TRICK HOUSE is getting trickier,\n" - .string "isn’t it?$" + .string "isn't it?$" Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB .string "Aaak!$" diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 5afce1c88..330b4fcd7 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -227,7 +227,7 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26D6CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CF45 @@ -253,7 +253,7 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A call_if 1, Route110_TrickHousePuzzle5_EventScript_26D374 compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D3AC - msgbox Route110_TrickHousePuzzle5_Text_26D8EA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE @@ -277,7 +277,7 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DA1E, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D017 @@ -301,7 +301,7 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D224 compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_26D25C - msgbox Route110_TrickHousePuzzle5_Text_26DB4C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D080 @@ -317,7 +317,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_27259A waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26DC78, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT random 3 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9 @@ -326,7 +326,7 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2 end Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 - msgbox Route110_TrickHousePuzzle5_Text_26D757, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT multichoice 0, 0, 25, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -334,7 +334,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45 end Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 - msgbox Route110_TrickHousePuzzle5_Text_26D7AA, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT multichoice 0, 0, 26, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -342,7 +342,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68 end Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B - msgbox Route110_TrickHousePuzzle5_Text_26D7FC, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT multichoice 0, 0, 27, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -350,7 +350,7 @@ Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B end Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE - msgbox Route110_TrickHousePuzzle5_Text_26D940, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT multichoice 0, 0, 28, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -358,7 +358,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE end Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 - msgbox Route110_TrickHousePuzzle5_Text_26D98C, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT multichoice 0, 0, 29, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -366,7 +366,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1 end Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 - msgbox Route110_TrickHousePuzzle5_Text_26D9CE, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT multichoice 0, 0, 30, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -374,7 +374,7 @@ Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4 end Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 - msgbox Route110_TrickHousePuzzle5_Text_26DA64, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT multichoice 0, 0, 31, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -382,7 +382,7 @@ Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017 end Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A - msgbox Route110_TrickHousePuzzle5_Text_26DAAD, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT multichoice 0, 0, 32, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -390,7 +390,7 @@ Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A end Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D - msgbox Route110_TrickHousePuzzle5_Text_26DAFF, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT multichoice 0, 0, 33, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -398,7 +398,7 @@ Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D end Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 - msgbox Route110_TrickHousePuzzle5_Text_26DB94, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT multichoice 0, 0, 34, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -406,7 +406,7 @@ Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080 end Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 - msgbox Route110_TrickHousePuzzle5_Text_26DBD7, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT multichoice 0, 0, 35, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -414,7 +414,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3 end Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 - msgbox Route110_TrickHousePuzzle5_Text_26DC2A, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT multichoice 0, 0, 36, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -422,7 +422,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6 end Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 - msgbox Route110_TrickHousePuzzle5_Text_26DCCB, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT multichoice 0, 0, 37, 1 switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -430,7 +430,7 @@ Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9 end Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C - msgbox Route110_TrickHousePuzzle5_Text_26DD1B, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT multichoice 0, 0, 38, 1 switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -438,7 +438,7 @@ Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C end Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F - msgbox Route110_TrickHousePuzzle5_Text_26DD5F, 4 + msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT multichoice 0, 0, 39, 1 switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0 @@ -448,15 +448,15 @@ Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152 waitse playse SE_HAZURE - msgbox Route110_TrickHousePuzzle5_Text_26D883, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632 applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632 - msgbox Route110_TrickHousePuzzle5_Text_26D8A1, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT waitmovement 0 - msgbox Route110_TrickHousePuzzle5_Text_26D8C9, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT closemessage warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate @@ -470,7 +470,7 @@ Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0 end Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA - msgbox Route110_TrickHousePuzzle5_Text_26D84D, 4 + msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT releaseall end @@ -1011,7 +1011,7 @@ Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9 Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA .string "CLICKETY-CLACK…\n" .string "MECHADOLL 2 AM I!\p" - .string "MECHADOLL 1’S QUIZ DIFFICULTY LEVEL\n" + .string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n" .string "IS SET TOO LOW.$" Route110_TrickHousePuzzle5_Text_26D940: @ 826D940 @@ -1066,18 +1066,18 @@ Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7 Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A .string "MECHADOLL 4 QUIZ.\p" - .string "In the TRAINER’S SCHOOL, how many\n" + .string "In the TRAINER'S SCHOOL, how many\n" .string "girl students were there?$" Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78 .string "CLICKETY-CLACK…\n" .string "MECHADOLL 5 AM I!\p" - .string "THE MASTER’S BEST AND PROUDEST\n" + .string "THE MASTER'S BEST AND PROUDEST\n" .string "ACHIEVEMENT AM I.$" Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB .string "MECHADOLL 5 QUIZ.\p" - .string "In SLATEPORT’s POKéMON FAN CLUB,\n" + .string "In SLATEPORT's POKéMON FAN CLUB,\n" .string "how many POKéMON were there?$" Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 0f20aac1f..53c548c20 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,18 +28,18 @@ Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6 end Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1 - trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 - msgbox Route110_TrickHousePuzzle6_Text_26DEF3, 6 + trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2 + msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8 - trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D - msgbox Route110_TrickHousePuzzle6_Text_26DFA0, 6 + trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D + msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F - trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 - msgbox Route110_TrickHousePuzzle6_Text_26E048, 6 + trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004 + msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26 @@ -54,12 +54,12 @@ Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93 .string "house, I had to check it out.$" Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2 - .string "I’ve discovered a tough TRAINER!$" + .string "I've discovered a tough TRAINER!$" Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3 - .string "I’m sure having a good time checking\n" + .string "I'm sure having a good time checking\n" .string "this place out.\p" - .string "It’s a challenge I’ve found worth\n" + .string "It's a challenge I've found worth\n" .string "repeating!$" Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55 @@ -74,14 +74,14 @@ Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0 .string "I was trying to cheat.$" Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7 - .string "I’m getting dizzy from these rotating\n" + .string "I'm getting dizzy from these rotating\n" .string "doors…$" Route110_TrickHousePuzzle6_Text_26E004: @ 826E004 - .string "Everything’s spinning around and\n" - .string "around. I can’t take this anymore…$" + .string "Everything's spinning around and\n" + .string "around. I can't take this anymore…$" Route110_TrickHousePuzzle6_Text_26E048: @ 826E048 - .string "You don’t seem to be affected at all.\n" + .string "You don't seem to be affected at all.\n" .string "Or do you have your poker face on?$" diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index fdf734423..4004c2e2c 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -304,33 +304,33 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373 end Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389 - trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 - msgbox Route110_TrickHousePuzzle7_Text_26E4F4, 6 + trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1 + msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0 - trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 - msgbox Route110_TrickHousePuzzle7_Text_26E57F, 6 + trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564 + msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7 - trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 - msgbox Route110_TrickHousePuzzle7_Text_26E61E, 6 + trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604 + msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE - trainerbattle 0, TRAINER_MARIELA, 0, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C - msgbox Route110_TrickHousePuzzle7_Text_26E6BC, 6 + trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C + msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5 - trainerbattle 0, TRAINER_ALVARO, 0, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 - msgbox Route110_TrickHousePuzzle7_Text_26E722, 6 + trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700 + msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC - trainerbattle 0, TRAINER_EVERETT, 0, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB - msgbox Route110_TrickHousePuzzle7_Text_26E7C4, 6 + trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB + msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413 @@ -345,7 +345,7 @@ Route110_TrickHousePuzzle7_Text_26E481: @ 826E481 .string "like smoke. How does he do it?$" Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1 - .string "Aiyeeeh! You’re much too strong!\n" + .string "Aiyeeeh! You're much too strong!\n" .string "How do you do it?$" Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4 @@ -358,49 +358,49 @@ Route110_TrickHousePuzzle7_Text_26E531: @ 826E531 Route110_TrickHousePuzzle7_Text_26E564: @ 826E564 .string "Defeated!\n" - .string "It’s a bad sign…$" + .string "It's a bad sign…$" Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F - .string "I’ve circled the same spot over ten\n" - .string "times now… It’s ill fortune…$" + .string "I've circled the same spot over ten\n" + .string "times now… It's ill fortune…$" Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0 .string "Whoever wins will get through here\n" - .string "first. That’s the feeling I get.$" + .string "first. That's the feeling I get.$" Route110_TrickHousePuzzle7_Text_26E604: @ 826E604 .string "Oh!\n" .string "Well, go ahead, then!$" Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E - .string "You’re solving all the puzzles in the\n" - .string "TRICK HOUSE. That’s the feeling I get.$" + .string "You're solving all the puzzles in the\n" + .string "TRICK HOUSE. That's the feeling I get.$" Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B .string "Nufufufu, here at last!\n" - .string "Let’s get right with it!$" + .string "Let's get right with it!$" Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C - .string "You’re so casual about winning!$" + .string "You're so casual about winning!$" Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC - .string "Humph! I’m not upset!\n" + .string "Humph! I'm not upset!\n" .string "Not me!$" Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA .string "I ever so closely watched you coming!$" Route110_TrickHousePuzzle7_Text_26E700: @ 826E700 - .string "This outcome I didn’t see coming…$" + .string "This outcome I didn't see coming…$" Route110_TrickHousePuzzle7_Text_26E722: @ 826E722 .string "Well, anyway, we both picked a weird\n" .string "place to get acquainted.\p" .string "As one weirdo to another,\n" - .string "let’s do our best!$" + .string "let's do our best!$" Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D - .string "It’s awfully cramped in here…$" + .string "It's awfully cramped in here…$" Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB .string "Oh, yes, strong you are.$" diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 369bc59a7..31aeb9e3a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,18 +14,18 @@ Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814 end Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F - trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 - msgbox Route110_TrickHousePuzzle8_Text_26E918, 6 + trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6 + msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836 - trainerbattle 0, TRAINER_KEIRA, 0, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F - msgbox Route110_TrickHousePuzzle8_Text_26E99F, 6 + trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F + msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D - trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 - msgbox Route110_TrickHousePuzzle8_Text_26EA3F, 6 + trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14 + msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE end Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864 @@ -40,26 +40,26 @@ Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD .string "this far.$" Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6 - .string "That must mean you’re tough, too…$" + .string "That must mean you're tough, too…$" Route110_TrickHousePuzzle8_Text_26E918: @ 826E918 - .string "You’ve beaten the POKéMON LEAGUE\n" - .string "CHAMPION? That’s too much!$" + .string "You've beaten the POKéMON LEAGUE\n" + .string "CHAMPION? That's too much!$" Route110_TrickHousePuzzle8_Text_26E954: @ 826E954 .string "Consider yourself lucky to be\n" .string "battling me!$" Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F - .string "This isn’t right!\n" - .string "I can’t lose!$" + .string "This isn't right!\n" + .string "I can't lose!$" Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F - .string "It’s a miracle that you beat me.\n" + .string "It's a miracle that you beat me.\n" .string "You can brag about it.$" Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7 - .string "You’ve been slugging through the TRICK\n" + .string "You've been slugging through the TRICK\n" .string "HOUSE challenge, too.$" Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index b339ee5de..2be579ab6 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -140,12 +140,12 @@ Route111_EventScript_1F0E60:: @ 81F0E60 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL checkflag FLAG_0x150 goto_eq Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, 4 + msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, 4 + msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT releaseall end @@ -165,18 +165,18 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 dodailyevents checkflag FLAG_0x92C goto_eq Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, 4 + msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 goto_eq Route111_EventScript_272054 setflag FLAG_0x92C special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, 4 + msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT release end Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, 4 + msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT release end @@ -213,7 +213,7 @@ Route111_EventScript_1F0F2E:: @ 81F0F2E end Route111_EventScript_1F0F45:: @ 81F0F45 - msgbox gUnknown_08272C5F, 4 + msgbox gUnknown_08272C5F, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 call_if 1, Route111_EventScript_1F0F7C @@ -279,20 +279,20 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, 5 + msgbox Route111_Text_1F1475, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, 4 + msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT release end Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, 4 - trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_1F1542 + msgbox Route111_Text_1F1523, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 applymovement 1, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, 4 + msgbox Route111_Text_1F156F, MSGBOX_DEFAULT closemessage applymovement 1, Route111_Movement_1F114A waitmovement 0 @@ -305,12 +305,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 2, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, 4 - trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_1F1616 + msgbox Route111_Text_1F159D, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 applymovement 2, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, 4 + msgbox Route111_Text_1F1645, MSGBOX_DEFAULT closemessage applymovement 2, Route111_Movement_1F114A waitmovement 0 @@ -323,12 +323,12 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 3, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, 4 - trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_1F16C6 + msgbox Route111_Text_1F167E, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 applymovement 3, Route111_Movement_2725A6 waitmovement 0 call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, 4 + msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT closemessage applymovement 3, Route111_Movement_1F114A waitmovement 0 @@ -341,9 +341,9 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7 applymovement 4, Route111_Movement_1F114D waitmovement 0 call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, 4 - trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, 4 + msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 + msgbox Route111_Text_1F1788, MSGBOX_DEFAULT closemessage applymovement 4, Route111_Movement_2725A6 waitmovement 0 @@ -381,35 +381,35 @@ Route111_Movement_1F114F: @ 81F114F step_end Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, 3 + msgbox Route111_Text_1F18CE, MSGBOX_SIGN end Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, 3 + msgbox Route111_Text_1F18E8, MSGBOX_SIGN end Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, 3 + msgbox Route111_Text_1F1921, MSGBOX_SIGN end Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, 3 + msgbox Route111_Text_1F1937, MSGBOX_SIGN end Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, 3 + msgbox Route111_Text_1F194D, MSGBOX_SIGN end Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, 3 + msgbox Route111_Text_1F1987, MSGBOX_SIGN end Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, 2 + msgbox Route111_Text_1F17BA, MSGBOX_NPC end Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, 2 + msgbox Route111_Text_1F186E, MSGBOX_NPC end Route111_EventScript_1F119B:: @ 81F119B @@ -421,22 +421,22 @@ Route111_EventScript_1F119B:: @ 81F119B goto_eq Route111_EventScript_1F11D0 checkflag FLAG_0x14E goto_eq Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, 4 + msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, 4 + msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT release end Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, 4 + msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT release end Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, 4 + msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT release end @@ -444,7 +444,7 @@ Route111_EventScript_1F11E4:: @ 81F11E4 lockall applymovement 46, Route111_Movement_27259E waitmovement 0 - msgbox Route111_Text_1F1CCA, 4 + msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT closemessage applymovement 46, Route111_Movement_2725A2 waitmovement 0 @@ -452,157 +452,148 @@ Route111_EventScript_1F11E4:: @ 81F11E4 end Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle 0, TRAINER_DREW, 0, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, 6 + trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A + msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE end Route111_EventScript_1F121B:: @ 81F121B - trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, 6 + trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 + msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle 0, TRAINER_BEAU, 0, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, 6 + trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 + msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, 6 + trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF + msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle 2, TRAINER_DUSTY_1, 0, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, 4 + msgbox Route111_Text_298B9A, MSGBOX_DEFAULT release end Route111_EventScript_1F128C:: @ 81F128C special sub_80B4808 waitmovement 0 - msgbox Route111_Text_298C00, 4 - setvar VAR_0x8004, 44 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 44 - callstd 8 + msgbox Route111_Text_298C00, MSGBOX_DEFAULT + register_matchcall TRAINER_DUSTY_1 release end Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, 6 + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 + msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, 6 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 + msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, 6 + trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E + msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE end Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, 6 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 + msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle 2, TRAINER_WILTON_1, 0, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, 4 + msgbox Route111_Text_298FD4, MSGBOX_DEFAULT release end Route111_EventScript_1F1333:: @ 81F1333 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29903D, 4 - setvar VAR_0x8004, 78 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 78 - callstd 8 + msgbox Route111_Text_29903D, MSGBOX_DEFAULT + register_matchcall TRAINER_WILTON_1 release end Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, 6 + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE + msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle 2, TRAINER_BROOKE_1, 0, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, 4 + msgbox Route111_Text_2991C2, MSGBOX_DEFAULT release end Route111_EventScript_1F1395:: @ 81F1395 special sub_80B4808 waitmovement 0 - msgbox Route111_Text_29921D, 4 - setvar VAR_0x8004, 94 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 94 - callstd 8 + msgbox Route111_Text_29921D, MSGBOX_DEFAULT + register_matchcall TRAINER_BROOKE_1 release end Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, 6 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 + msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle 0, TRAINER_HAYDEN, 0, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, 6 + trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE + msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle 0, TRAINER_BIANCA, 0, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, 6 + trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D + msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE end Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle 0, TRAINER_TYRON, 0, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, 6 + trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 + msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle 0, TRAINER_CELINA, 0, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, 6 + trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 + msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle 0, TRAINER_CELIA, 0, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, 6 + trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 + msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE end Route111_EventScript_1F143E:: @ 81F143E - trainerbattle 0, TRAINER_BRYAN, 0, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, 6 + trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 + msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE end Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle 0, TRAINER_BRANDEN, 0, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, 6 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 + msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE end Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, 3 + msgbox Route111_Text_1F1D61, MSGBOX_SIGN end Route111_Text_1F1475: @ 81F1475 - .string "Hello! I take it you’re a traveler.\p" - .string "How’s this? What do you say to taking\n" + .string "Hello! I take it you're a traveler.\p" + .string "How's this? What do you say to taking\n" .string "on our family of four in a series of\l" .string "POKéMON battles?$" @@ -611,33 +602,33 @@ Route111_Text_1F14F5: @ 81F14F5 .string "Drop in, if you change your mind!$" Route111_Text_1F1523: @ 81F1523 - .string "That’s the spirit! I like you!$" + .string "That's the spirit! I like you!$" Route111_Text_1F1542: @ 81F1542 .string "Aiyah!\n" - .string "You’re a lot tougher than I expected!$" + .string "You're a lot tougher than I expected!$" Route111_Text_1F156F: @ 81F156F .string "Hey, all!\n" - .string "I’ve found a pretty strong TRAINER!$" + .string "I've found a pretty strong TRAINER!$" Route111_Text_1F159D: @ 81F159D - .string "Oh, my goodness! Aren’t you young?\p" + .string "Oh, my goodness! Aren't you young?\p" .string "You must be quite the TRAINER to beat\n" .string "my husband, though.\p" - .string "It’s my turn to battle now!$" + .string "It's my turn to battle now!$" Route111_Text_1F1616: @ 81F1616 .string "Oh, gosh!\n" - .string "I can’t get over how strong you are!$" + .string "I can't get over how strong you are!$" Route111_Text_1F1645: @ 81F1645 - .string "There’s a strong TRAINER here!\n" - .string "This one’s really strong!$" + .string "There's a strong TRAINER here!\n" + .string "This one's really strong!$" Route111_Text_1F167E: @ 81F167E - .string "You’re stronger than Mommy? Wow!\p" - .string "But I’m strong, too!\n" + .string "You're stronger than Mommy? Wow!\p" + .string "But I'm strong, too!\n" .string "Really! Honestly!$" Route111_Text_1F16C6: @ 81F16C6 @@ -650,7 +641,7 @@ Route111_Text_1F16DC: @ 81F16DC Route111_Text_1F16FB: @ 81F16FB .string "How dare you make my granddaughter\n" .string "cry!\p" - .string "For that, I’m going to smack you!\n" + .string "For that, I'm going to smack you!\n" .string "Prepare to lose!$" Route111_Text_1F1756: @ 81F1756 @@ -658,14 +649,14 @@ Route111_Text_1F1756: @ 81F1756 .string "My granddaughter was right…$" Route111_Text_1F1788: @ 81F1788 - .string "If you’re not in any hurry,\n" + .string "If you're not in any hurry,\n" .string "visit with us awhile.$" Route111_Text_1F17BA: @ 81F17BA - .string "If you don’t raise your POKéMON some\n" + .string "If you don't raise your POKéMON some\n" .string "more, it could be tough to keep winning\l" .string "up through the ranks.\p" - .string "I’ve heard the POKéMON LEAGUE’s\n" + .string "I've heard the POKéMON LEAGUE's\n" .string "ELITE FOUR are far stronger than\l" .string "any GYM LEADER.$" @@ -679,8 +670,8 @@ Route111_Text_1F18CE: @ 81F18CE .string "{DOWN_ARROW} MAUVILLE CITY$" Route111_Text_1F18E8: @ 81F18E8 - .string "“Our family’s hearts beat as one!”\n" - .string "THE WINSTRATE’S HOUSE$" + .string "“Our family's hearts beat as one!”\n" + .string "THE WINSTRATE'S HOUSE$" Route111_Text_1F1921: @ 81F1921 .string "ROUTE 111\n" @@ -691,12 +682,12 @@ Route111_Text_1F1937: @ 81F1937 .string "{LEFT_ARROW} ROUTE 113$" Route111_Text_1F194D: @ 81F194D - .string "OLD LADY’S REST STOP\n" + .string "OLD LADY'S REST STOP\n" .string "“Come in and rest your tired bones.”$" Route111_Text_1F1987: @ 81F1987 .string "TRAINER TIPS\p" - .string "One of the indicators of a POKéMON’s\n" + .string "One of the indicators of a POKéMON's\n" .string "powerfulness is SP. ATK. It stands for\l" .string "“SPECIAL ATTACK.”\p" .string "Likewise, SP. DEF stands for “SPECIAL\n" @@ -707,7 +698,7 @@ Route111_Text_1F1A22: @ 81F1A22 .string "around here somewhere.\p" .string "But for some reason, it can be seen\n" .string "sometimes, and sometimes not.\p" - .string "That’s why I call it the MIRAGE TOWER.$" + .string "That's why I call it the MIRAGE TOWER.$" Route111_Text_1F1AC7: @ 81F1AC7 .string "I see it!\n" @@ -716,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7 .string "is clearly visible!\p" .string "But it looks so fragile…\n" .string "It could crumble away anytime…\p" - .string "I want to go inside it, but I can’t\n" + .string "I want to go inside it, but I can't\n" .string "get my courage up for it…$" Route111_Text_1F1B92: @ 81F1B92 @@ -729,7 +720,7 @@ Route111_Text_1F1B92: @ 81F1B92 Route111_Text_1F1C12: @ 81F1C12 .string "Since I spoke to you, the tower of sand\n" - .string "hasn’t been seen.\p" + .string "hasn't been seen.\p" .string "Perhaps it really was\n" .string "the MIRAGE TOWER…$" diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 015a584f4..f98e994b3 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -9,7 +9,7 @@ Route111_OldLadysRestStop_MapScript1_22A91C: @ 822A91C Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 lock faceplayer - msgbox Route111_OldLadysRestStop_Text_22A978, 5 + msgbox Route111_OldLadysRestStop_Text_22A978, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -17,10 +17,10 @@ Route111_OldLadysRestStop_EventScript_22A920:: @ 822A920 end Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 - msgbox Route111_OldLadysRestStop_Text_22A9EC, 4 + msgbox Route111_OldLadysRestStop_Text_22A9EC, MSGBOX_DEFAULT closemessage call Route111_OldLadysRestStop_EventScript_272083 - msgbox Route111_OldLadysRestStop_Text_22AA16, 5 + msgbox Route111_OldLadysRestStop_Text_22AA16, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route111_OldLadysRestStop_EventScript_22A941 compare VAR_RESULT, 0 @@ -28,27 +28,27 @@ Route111_OldLadysRestStop_EventScript_22A941:: @ 822A941 end Route111_OldLadysRestStop_EventScript_22A96E:: @ 822A96E - msgbox Route111_OldLadysRestStop_Text_22AA8F, 4 + msgbox Route111_OldLadysRestStop_Text_22AA8F, MSGBOX_DEFAULT release end Route111_OldLadysRestStop_Text_22A978: @ 822A978 .string "Oh, dear, dear.\n" - .string "Aren’t your POKéMON exhausted?\p" - .string "If you’d like, rest up here.\n" - .string "That’s a fine idea! You should do that.$" + .string "Aren't your POKéMON exhausted?\p" + .string "If you'd like, rest up here.\n" + .string "That's a fine idea! You should do that.$" Route111_OldLadysRestStop_Text_22A9EC: @ 822A9EC - .string "That’s right.\n" + .string "That's right.\n" .string "Take your time and rest up!$" Route111_OldLadysRestStop_Text_22AA16: @ 822AA16 .string "Oh, dear, dear.\n" .string "Are your POKéMON still tired?\p" .string "You should take another rest here.\n" - .string "That’s a fine idea. You should do that.$" + .string "That's a fine idea. You should do that.$" Route111_OldLadysRestStop_Text_22AA8F: @ 822AA8F .string "Is that so?\n" - .string "You don’t need to be shy about it.$" + .string "You don't need to be shy about it.$" diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 13a897692..8160d7623 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A48D:: @ 822A48D lock faceplayer setvar VAR_0x8008, 2 - msgbox Route111_WinstrateFamilysHouse_Text_22A539, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A539, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -15,7 +15,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 setvar VAR_0x8008, 3 checkflag FLAG_0x115 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 goto_eq Route111_WinstrateFamilysHouse_EventScript_272054 @@ -24,7 +24,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 end Route111_WinstrateFamilysHouse_EventScript_22A4DA:: @ 822A4DA - msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6B4, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -32,7 +32,7 @@ Route111_WinstrateFamilysHouse_EventScript_22A4E8:: @ 822A4E8 lock faceplayer setvar VAR_0x8008, 1 - msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A6F7, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -42,13 +42,13 @@ Route111_WinstrateFamilysHouse_EventScript_22A4FD:: @ 822A4FD setvar VAR_0x8008, 4 checkflag FLAG_TEMP_4 goto_eq Route111_WinstrateFamilysHouse_EventScript_22A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A780, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A780, MSGBOX_DEFAULT setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_22A52C end Route111_WinstrateFamilysHouse_EventScript_22A51E:: @ 822A51E - msgbox Route111_WinstrateFamilysHouse_Text_22A89B, 4 + msgbox Route111_WinstrateFamilysHouse_Text_22A89B, MSGBOX_DEFAULT goto Route111_WinstrateFamilysHouse_EventScript_22A52C end @@ -60,19 +60,19 @@ Route111_WinstrateFamilysHouse_EventScript_22A52C:: @ 822A52C end Route111_WinstrateFamilysHouse_Text_22A539: @ 822A539 - .string "You’re the first TRAINER I’ve seen who\n" + .string "You're the first TRAINER I've seen who\n" .string "deploys POKéMON so masterfully.\p" .string "But, I should tell you--my son is\n" .string "stronger than you.\p" .string "He even took the POKéMON LEAGUE\n" - .string "challenge, I’ll have you know.$" + .string "challenge, I'll have you know.$" Route111_WinstrateFamilysHouse_Text_22A5F4: @ 822A5F4 .string "We use this MACHO BRACE to more\n" .string "effectively strengthen our POKéMON\l" .string "in training.\p" - .string "Since you’ve beaten all of us here,\n" - .string "I don’t know if you need it, but we\l" + .string "Since you've beaten all of us here,\n" + .string "I don't know if you need it, but we\l" .string "would like you to have our MACHO BRACE.$" Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 @@ -81,16 +81,16 @@ Route111_WinstrateFamilysHouse_Text_22A6B4: @ 822A6B4 Route111_WinstrateFamilysHouse_Text_22A6F7: @ 822A6F7 .string "Mommy is stronger than Daddy.\p" - .string "I’m stronger than Mommy.\p" - .string "And Grandma’s stronger than me!\p" + .string "I'm stronger than Mommy.\p" + .string "And Grandma's stronger than me!\p" .string "But my big brother is even stronger\n" .string "than Grandma.$" Route111_WinstrateFamilysHouse_Text_22A780: @ 822A780 - .string "There’s no question that you’re strong.\p" + .string "There's no question that you're strong.\p" .string "But if you were to battle my grandson,\n" - .string "you’d end up crying in frustration.\p" - .string "He’s much stronger than any TRAINER\n" + .string "you'd end up crying in frustration.\p" + .string "He's much stronger than any TRAINER\n" .string "our family knows.\p" .string "He must be challenging the POKéMON\n" .string "LEAGUE CHAMPION by now.\p" diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 4f7e20b94..1abcdb6b4 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -13,7 +13,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, 4 + msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, 4 + msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Route112_Movement_2725A8 waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, 4 + msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT closemessage applymovement 1, Route112_Movement_2725A2 waitmovement 0 @@ -37,7 +37,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Route112_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, 4 + msgbox Route112_Text_1F2003, MSGBOX_DEFAULT closemessage applymovement 6, Route112_Movement_2725A2 waitmovement 0 @@ -45,69 +45,66 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 end Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, 3 + msgbox Route112_Text_1F20C1, MSGBOX_SIGN end Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, 3 + msgbox Route112_Text_1F20ED, MSGBOX_SIGN end Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, 3 + msgbox Route112_Text_1F2138, MSGBOX_SIGN end Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, 2 + msgbox Route112_Text_1F204E, MSGBOX_NPC end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, 6 + trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA + msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, 4 + msgbox Route112_Text_299896, MSGBOX_DEFAULT release end Route112_EventScript_1F1EAD:: @ 81F1EAD special sub_80B4808 waitmovement 0 - msgbox Route112_Text_29993C, 4 - setvar VAR_0x8004, 627 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 627 - callstd 8 + msgbox Route112_Text_29993C, MSGBOX_DEFAULT + register_matchcall TRAINER_TRENT_1 release end Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, 6 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 + msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, 6 + trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC + msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, 6 + trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 + msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, 6 + trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF + msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, 6 + trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F + msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end Route112_Text_1F1F3F: @ 81F1F3F @@ -119,16 +116,16 @@ Route112_Text_1F1F7A: @ 81F1F7A .string "we need a METEORITE to do it.$" Route112_Text_1F1FBA: @ 81F1FBA - .string "Oh, I get it now. That’s why the rest\n" + .string "Oh, I get it now. That's why the rest\n" .string "of the crew went out to FALLARBOR.$" Route112_Text_1F2003: @ 81F2003 .string "You got it. And until they come back,\n" - .string "we’re not to let anyone pass, right.$" + .string "we're not to let anyone pass, right.$" Route112_Text_1F204E: @ 81F204E - .string "Eh, I’d like to get to MAUVILLE, but if\n" - .string "I went down these ledges, it’d be no\l" + .string "Eh, I'd like to get to MAUVILLE, but if\n" + .string "I went down these ledges, it'd be no\l" .string "easy matter to get back to LAVARIDGE.$" Route112_Text_1F20C1: @ 81F20C1 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 93e8ea759..a7d3e8c7a 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -32,7 +32,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 lock faceplayer - msgbox Route112_CableCarStation_Text_22AB85, 5 + msgbox Route112_CableCarStation_Text_22AB85, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route112_CableCarStation_EventScript_22AB38 compare VAR_RESULT, 0 @@ -40,7 +40,7 @@ Route112_CableCarStation_EventScript_22AB17:: @ 822AB17 end Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 - msgbox Route112_CableCarStation_Text_22ABC2, 4 + msgbox Route112_CableCarStation_Text_22ABC2, MSGBOX_DEFAULT closemessage applymovement 1, Route112_CableCarStation_Movement_22AB71 applymovement 255, Route112_CableCarStation_Movement_22AB7B @@ -49,13 +49,13 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38 setvar VAR_0x40A3, 1 incrementgamestat 48 special CableCarWarp - special sub_814FC9C + special CableCar waitstate release end Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 - msgbox Route112_CableCarStation_Text_22ABD8, 4 + msgbox Route112_CableCarStation_Text_22ABD8, MSGBOX_DEFAULT release end diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index ce2c4b47d..b9ece3b21 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -25,134 +25,128 @@ Route113_EventScript_1F2189:: @ 81F2189 return Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, 2 + msgbox Route113_Text_1F235B, MSGBOX_NPC end Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, 2 + msgbox Route113_Text_1F23CA, MSGBOX_NPC end Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, 3 + msgbox Route113_Text_1F2440, MSGBOX_SIGN end Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, 3 + msgbox Route113_Text_1F2456, MSGBOX_SIGN end Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, 3 + msgbox Route113_Text_1F24F8, MSGBOX_SIGN end Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, 3 + msgbox Route113_Text_1F2471, MSGBOX_SIGN end Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle 0, TRAINER_JAYLEN, 0, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, 6 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 + msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, 6 + trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C + msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE end Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, 4 + msgbox Route113_Text_299F15, MSGBOX_DEFAULT release end Route113_EventScript_1F221A:: @ 81F221A special sub_80B4808 waitmovement 0 - msgbox Route113_Text_299F49, 4 - setvar VAR_0x8004, 434 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 434 - callstd 8 + msgbox Route113_Text_299F49, MSGBOX_DEFAULT + register_matchcall TRAINER_MADELINE_1 release end Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, 6 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 + msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C + trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, 4 + msgbox Route113_Text_29A067, MSGBOX_DEFAULT release end Route113_EventScript_1F227C:: @ 81F227C special sub_80B4808 waitmovement 0 - msgbox Route113_Text_29A0A2, 4 - setvar VAR_0x8004, 419 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 419 - callstd 8 + msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT + register_matchcall TRAINER_LAO_1 release end Route113_EventScript_1F229B:: @ 81F229B - trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, 6 + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F + msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, 6 + trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 + msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F + msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, 6 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 + msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE end Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle 0, TRAINER_SOPHIE, 0, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, 6 + trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 + msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle 0, TRAINER_COBY, 0, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, 6 + trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 + msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE end Route113_EventScript_1F232D:: @ 81F232D - trainerbattle 0, TRAINER_LAWRENCE, 0, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, 6 + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 + msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE end Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle 0, TRAINER_WYATT, 0, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, 6 + trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 + msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE end Route113_Text_1F235B: @ 81F235B - .string "Wahahaha! Today’s technology is a\n" + .string "Wahahaha! Today's technology is a\n" .string "wondrous thing!\p" .string "Take this volcanic ash here.\n" .string "It can be fashioned into glass.$" Route113_Text_1F23CA: @ 81F23CA - .string "It’s fun walking through the volcano’s\n" + .string "It's fun walking through the volcano's\n" .string "ashes on the ground and grass.\p" - .string "You can see where you walked--it’s\n" + .string "You can see where you walked--it's\n" .string "really neat!$" Route113_Text_1F2440: @ 81F2440 diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 5ea100567..c211b6a1c 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -21,15 +21,15 @@ Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E goto_eq Route113_GlassWorkshop_EventScript_26ED6E compare VAR_0x40BE, 1 goto_eq Route113_GlassWorkshop_EventScript_26ED64 - msgbox Route113_GlassWorkshop_Text_26F19D, 4 + msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT giveitem_std ITEM_SOOT_SACK setvar VAR_0x40BE, 1 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26ED64:: @ 826ED64 - msgbox Route113_GlassWorkshop_Text_26F252, 4 + msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT release end @@ -37,7 +37,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E checkitem ITEM_SOOT_SACK, 1 compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26ED9D - msgbox Route113_GlassWorkshop_Text_26F312, 4 + msgbox Route113_GlassWorkshop_Text_26F312, MSGBOX_DEFAULT compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFD6 message Route113_GlassWorkshop_Text_26F40A @@ -46,7 +46,7 @@ Route113_GlassWorkshop_EventScript_26ED6E:: @ 826ED6E end Route113_GlassWorkshop_EventScript_26ED9D:: @ 826ED9D - msgbox Route113_GlassWorkshop_Text_26F772, 4 + msgbox Route113_GlassWorkshop_Text_26F772, MSGBOX_DEFAULT release end @@ -73,7 +73,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 10 @@ -87,7 +87,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 11 @@ -101,7 +101,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96 setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 12 @@ -115,7 +115,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2 setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 13 @@ -129,7 +129,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 14 @@ -144,7 +144,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 15 @@ -159,7 +159,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_26EFEE - msgbox Route113_GlassWorkshop_Text_26F480, 5 + msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route113_GlassWorkshop_EventScript_26F003 setvar VAR_0x40BE, 16 @@ -168,7 +168,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B end Route113_GlassWorkshop_EventScript_26EFCC:: @ 826EFCC - msgbox Route113_GlassWorkshop_Text_26F641, 4 + msgbox Route113_GlassWorkshop_Text_26F641, MSGBOX_DEFAULT release end @@ -176,7 +176,7 @@ Route113_GlassWorkshop_EventScript_26EFD6:: @ 826EFD6 setvar VAR_0x800A, 250 subvar VAR_0x800A, 16456 buffernumberstring 0, VAR_0x800A - msgbox Route113_GlassWorkshop_Text_26F34E, 4 + msgbox Route113_GlassWorkshop_Text_26F34E, MSGBOX_DEFAULT release end @@ -195,13 +195,13 @@ Route113_GlassWorkshop_EventScript_26F003:: @ 826F003 end Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F - msgbox Route113_GlassWorkshop_Text_26F4DA, 4 + msgbox Route113_GlassWorkshop_Text_26F4DA, MSGBOX_DEFAULT closemessage fadescreen 1 playse SE_SELECT delay 30 fadescreen 0 - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -224,13 +224,13 @@ Route113_GlassWorkshop_EventScript_26F05F:: @ 826F05F Route113_GlassWorkshop_EventScript_26F072:: @ 826F072 call Route113_GlassWorkshop_EventScript_27205E - msgbox Route113_GlassWorkshop_Text_26F6B7, 4 + msgbox Route113_GlassWorkshop_Text_26F6B7, MSGBOX_DEFAULT release end Route113_GlassWorkshop_EventScript_26F081:: @ 826F081 call Route113_GlassWorkshop_EventScript_272071 - msgbox Route113_GlassWorkshop_Text_26F715, 4 + msgbox Route113_GlassWorkshop_Text_26F715, MSGBOX_DEFAULT release end @@ -295,7 +295,7 @@ Route113_GlassWorkshop_EventScript_26F15B:: @ 826F15B end Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F - msgbox Route113_GlassWorkshop_Text_26F688, 4 + msgbox Route113_GlassWorkshop_Text_26F688, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_26F047 compare VAR_0x8009, 1 @@ -305,13 +305,13 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F end Route113_GlassWorkshop_EventScript_26F194:: @ 826F194 - msgbox Route113_GlassWorkshop_Text_26F7EC, 2 + msgbox Route113_GlassWorkshop_Text_26F7EC, MSGBOX_NPC end Route113_GlassWorkshop_Text_26F19D: @ 826F19D .string "This area is covered in volcanic ash,\n" .string "huff-puff!\p" - .string "I’m specially gifted, huff-puff.\p" + .string "I'm specially gifted, huff-puff.\p" .string "I make glass out of volcanic ash\n" .string "and make items, huff-puff.\p" .string "Go collect ashes with this, huff-puff.$" @@ -321,7 +321,7 @@ Route113_GlassWorkshop_Text_26F252: @ 826F252 .string "through piles of ash, huff-puff.\p" .string "And it will fill up with the volcanic ash,\n" .string "huff-puff.\p" - .string "Once you think you’ve collected a good\n" + .string "Once you think you've collected a good\n" .string "amount, come see me, huff-puff.$" Route113_GlassWorkshop_Text_26F312: @ 826F312 @@ -330,16 +330,16 @@ Route113_GlassWorkshop_Text_26F312: @ 826F312 Route113_GlassWorkshop_Text_26F34E: @ 826F34E .string "Hmmm…\n" - .string "There’s not enough ash here, huff-puff.\l" - .string "I can’t make glass with this, huff-puff.\p" - .string "Let’s see… {STR_VAR_1} is the number of steps\n" - .string "you’ll need to walk for me to make you\l" + .string "There's not enough ash here, huff-puff.\l" + .string "I can't make glass with this, huff-puff.\p" + .string "Let's see… {STR_VAR_1} is the number of steps\n" + .string "you'll need to walk for me to make you\l" .string "a BLUE FLUTE, huff-puff.$" Route113_GlassWorkshop_Text_26F40A: @ 826F40A .string "Oh!\n" - .string "You’ve got a lot of ashes, huff-puff!\p" - .string "I’ll make you a glass item, huff-puff!\n" + .string "You've got a lot of ashes, huff-puff!\p" + .string "I'll make you a glass item, huff-puff!\n" .string "Which one would you like, huff-puff?$" Route113_GlassWorkshop_Text_26F480: @ 826F480 @@ -351,47 +351,47 @@ Route113_GlassWorkshop_Text_26F4B5: @ 826F4B5 Route113_GlassWorkshop_Text_26F4DA: @ 826F4DA .string "A {STR_VAR_1} it is, then, huff-puff!\p" - .string "Okay! I’ll make it for you, huff-puff.\n" + .string "Okay! I'll make it for you, huff-puff.\n" .string "Just wait a little while, huff-puff.$" Route113_GlassWorkshop_Text_26F543: @ 826F543 .string "A {STR_VAR_1}, huff-puff?\p" - .string "There’s not enough ash here to make\n" + .string "There's not enough ash here to make\n" .string "that, though, huff-puff.\p" - .string "Let’s see… {STR_VAR_2} is the number of steps\n" - .string "you’ll need to walk through volcanic ash\l" + .string "Let's see… {STR_VAR_2} is the number of steps\n" + .string "you'll need to walk through volcanic ash\l" .string "for me to make that item, huff-puff.\p" .string "Which item would you rather have me\n" .string "make instead, huff-puff?$" Route113_GlassWorkshop_Text_26F641: @ 826F641 - .string "You’ve collected all that ash, but you\n" - .string "don’t want anything, huff-puff?$" + .string "You've collected all that ash, but you\n" + .string "don't want anything, huff-puff?$" Route113_GlassWorkshop_Text_26F688: @ 826F688 - .string "Ah, I’ve finished your {STR_VAR_1}.\n" + .string "Ah, I've finished your {STR_VAR_1}.\n" .string "Take it, huff-puff.$" Route113_GlassWorkshop_Text_26F6B7: @ 826F6B7 .string "Oh?\n" - .string "You’ve no room in your BAG, huff-puff.\p" - .string "I’ll hold on to it, so come back later,\n" + .string "You've no room in your BAG, huff-puff.\p" + .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" Route113_GlassWorkshop_Text_26F715: @ 826F715 .string "Oh?\n" - .string "You’ve no room in your PC, huff-puff?\p" - .string "I’ll hold on to it, so come back later,\n" + .string "You've no room in your PC, huff-puff?\p" + .string "I'll hold on to it, so come back later,\n" .string "huff-puff.$" Route113_GlassWorkshop_Text_26F772: @ 826F772 - .string "Hah? You haven’t got your SOOT SACK\n" + .string "Hah? You haven't got your SOOT SACK\n" .string "with you, huff-puff.\p" .string "You have to keep it with you to collect\n" .string "volcanic ash, huff-puff.$" Route113_GlassWorkshop_Text_26F7EC: @ 826F7EC - .string "It’s fun to blow a glass flute while\n" + .string "It's fun to blow a glass flute while\n" .string "my boss is talking.\p" .string "Huff-huff! Puff-puff!$" diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 9443d35bc..6adf20870 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -30,7 +30,7 @@ Route114_EventScript_1F2582:: @ 81F2582 dodailyevents checkflag FLAG_0x92B goto_eq Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, 4 + msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 addvar VAR_RESULT, 133 @@ -38,12 +38,12 @@ Route114_EventScript_1F2582:: @ 81F2582 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x92B - msgbox Route114_Text_2A7034, 4 + msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release end Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, 4 + msgbox Route114_Text_2A706E, MSGBOX_DEFAULT release end @@ -52,17 +52,17 @@ Route114_EventScript_1F25D1:: @ 81F25D1 faceplayer checkflag FLAG_0x0E7 goto_eq Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, 4 + msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 goto_eq Route114_EventScript_272054 setflag FLAG_0x0E7 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, 4 + msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end @@ -71,126 +71,120 @@ Route114_EventScript_1F2612:: @ 81F2612 faceplayer waitse playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, 4 + msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT waitmoncry release end Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, 3 + msgbox Route114_Text_1F28B3, MSGBOX_SIGN end Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, 3 + msgbox Route114_Text_1F28DB, MSGBOX_SIGN end Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, 3 + msgbox Route114_Text_1F2910, MSGBOX_SIGN end Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, 6 + trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 + msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, 6 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 + msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE end Route114_EventScript_1F266E:: @ 81F266E - trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, 6 + trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F + msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, 6 + trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E + msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE end Route114_EventScript_1F269C:: @ 81F269C - trainerbattle 2, TRAINER_STEVE_1, 0, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 + trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, 4 + msgbox Route114_Text_29A981, MSGBOX_DEFAULT release end Route114_EventScript_1F26C8:: @ 81F26C8 special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29A9F7, 4 - setvar VAR_0x8004, 143 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 143 - callstd 8 + msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT + register_matchcall TRAINER_STEVE_1 release end Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, 6 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67 + msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE end Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle 2, TRAINER_BERNIE_1, 0, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, 4 + msgbox Route114_Text_29AB36, MSGBOX_DEFAULT release end Route114_EventScript_1F272A:: @ 81F272A special sub_80B4808 waitmovement 0 - msgbox Route114_Text_29ABA6, 4 - setvar VAR_0x8004, 206 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 206 - callstd 8 + msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT + register_matchcall TRAINER_BERNIE_1 release end Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, 6 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10 + msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, 6 + trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A + msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE end Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, 6 + trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 + msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE end Route114_EventScript_1F278E:: @ 81F278E - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, 6 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D + msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, 6 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B + msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle 0, TRAINER_ANGELINA, 0, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, 6 + trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C + msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle 0, TRAINER_CHARLOTTE, 0, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, 6 + trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB + msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE end Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle 0, TRAINER_KAI, 0, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, 6 + trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 + msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE end Route114_Text_1F2809: @ 81F2809 @@ -211,9 +205,9 @@ Route114_Text_1F28B3: @ 81F28B3 .string "RUSTBORO CITY THROUGH HERE$" Route114_Text_1F28DB: @ 81F28DB - .string "FOSSIL MANIAC’S HOUSE\n" + .string "FOSSIL MANIAC'S HOUSE\n" .string "“Fossils gratefully accepted!”$" Route114_Text_1F2910: @ 81F2910 - .string "LANETTE’S HOUSE$" + .string "LANETTE'S HOUSE$" diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index f14c15f9e..f2e62b451 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -11,7 +11,7 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A faceplayer checkflag FLAG_0x105 goto_eq Route114_FossilManiacsHouse_EventScript_22AD69 - msgbox Route114_FossilManiacsHouse_Text_22AD85, 4 + msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 goto_eq Route114_FossilManiacsHouse_EventScript_272054 @@ -20,21 +20,21 @@ Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A end Route114_FossilManiacsHouse_EventScript_22AD69:: @ 822AD69 - msgbox Route114_FossilManiacsHouse_Text_22AE48, 4 + msgbox Route114_FossilManiacsHouse_Text_22AE48, MSGBOX_DEFAULT release end Route114_FossilManiacsHouse_EventScript_22AD73:: @ 822AD73 - msgbox Route114_FossilManiacsHouse_Text_22AE92, 3 + msgbox Route114_FossilManiacsHouse_Text_22AE92, MSGBOX_SIGN end Route114_FossilManiacsHouse_EventScript_22AD7C:: @ 822AD7C - msgbox Route114_FossilManiacsHouse_Text_22AEC2, 3 + msgbox Route114_FossilManiacsHouse_Text_22AEC2, MSGBOX_SIGN end Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 - .string "My big brother’s the FOSSIL MANIAC…\n" - .string "He’s a nice guy who loves FOSSILS…\p" + .string "My big brother's the FOSSIL MANIAC…\n" + .string "He's a nice guy who loves FOSSILS…\p" .string "He loves digging holes, too…\n" .string "He dug this hole by himself…\p" .string "You can have this, so you can DIG\n" @@ -42,7 +42,7 @@ Route114_FossilManiacsHouse_Text_22AD85: @ 822AD85 Route114_FossilManiacsHouse_Text_22AE48: @ 822AE48 .string "If you make a POKéMON DIG inside a\n" - .string "cave, you’re returned to the entrance…$" + .string "cave, you're returned to the entrance…$" Route114_FossilManiacsHouse_Text_22AE92: @ 822AE92 .string "Rocks in peculiar shapes fill\n" @@ -52,5 +52,5 @@ Route114_FossilManiacsHouse_Text_22AEC2: @ 822AEC2 .string "THE COMPOSITION OF STRATA…\n" .string "HOW RAIN SHAPES THE LAND…\l" .string "STONES, SOIL, AND ROCK…\p" - .string "It’s crammed with books.$" + .string "It's crammed with books.$" diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index bc5a6d977..7b2a91810 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -28,7 +28,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 applymovement 1, Route114_FossilManiacsTunnel_Movement_2725A6 applymovement 255, Route114_FossilManiacsTunnel_Movement_2725AA waitmovement 0 - msgbox Route114_FossilManiacsTunnel_Text_22B1F7, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT setvar VAR_0x40CC, 2 releaseall end @@ -44,37 +44,37 @@ Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 checkitem ITEM_CLAW_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq Route114_FossilManiacsTunnel_EventScript_22AFBC - msgbox Route114_FossilManiacsTunnel_Text_22AFD0, 4 + msgbox Route114_FossilManiacsTunnel_Text_22AFD0, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFBC:: @ 822AFBC - msgbox Route114_FossilManiacsTunnel_Text_22B0D6, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B0D6, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_EventScript_22AFC6:: @ 822AFC6 - msgbox Route114_FossilManiacsTunnel_Text_22B1CC, 4 + msgbox Route114_FossilManiacsTunnel_Text_22B1CC, MSGBOX_DEFAULT release end Route114_FossilManiacsTunnel_Text_22AFD0: @ 822AFD0 - .string "I’m the FOSSIL MANIAC…\n" - .string "I’m a nice guy who loves FOSSILS…\p" + .string "I'm the FOSSIL MANIAC…\n" + .string "I'm a nice guy who loves FOSSILS…\p" .string "Do you want a FOSSIL?\p" .string "But the FOSSILS around these parts all\n" .string "belong to me… None for you…\p" - .string "If you can’t bear to go without\n" + .string "If you can't bear to go without\n" .string "a FOSSIL, look in a desert where there\l" .string "are boulders and sand that may hide\l" .string "FOSSILS…$" Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 - .string "You found a FOSSIL, didn’t you?\n" - .string "That’s so nice… It’s so dreamy…\p" + .string "You found a FOSSIL, didn't you?\n" + .string "That's so nice… It's so dreamy…\p" .string "What are you going to do with that\n" .string "FOSSIL?\p" - .string "From what I’ve heard, DEVON is doing\n" + .string "From what I've heard, DEVON is doing\n" .string "research on reviving POKéMON from\l" .string "FOSSILS…\p" .string "I love my FOSSILS, so I would never\n" @@ -82,15 +82,15 @@ Route114_FossilManiacsTunnel_Text_22B0D6: @ 822B0D6 Route114_FossilManiacsTunnel_Text_22B1CC: @ 822B1CC .string "FOSSILS are so… Wonderful…\n" - .string "It’s so dreamy…$" + .string "It's so dreamy…$" Route114_FossilManiacsTunnel_Text_22B1F7: @ 822B1F7 .string "Oh…\n" - .string "It’s not safe that way…\p" + .string "It's not safe that way…\p" .string "I was digging away, you see…\n" .string "When the whole wall collapsed…\p" - .string "I think there’s a giant cavern\n" + .string "I think there's a giant cavern\n" .string "underneath now…\p" - .string "But I’ve left it alone because I don’t\n" + .string "But I've left it alone because I don't\n" .string "think there are any FOSSILS there…$" diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 00bb4f226..0145ee945 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -12,7 +12,7 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 checkflag FLAG_0x083 goto_eq Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE - msgbox Route114_LanettesHouse_Text_22B34E, 4 + msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 goto_eq Route114_LanettesHouse_EventScript_272067 @@ -21,37 +21,37 @@ Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 end Route114_LanettesHouse_EventScript_22B2FF:: @ 822B2FF - msgbox Route114_LanettesHouse_Text_22B407, 4 + msgbox Route114_LanettesHouse_Text_22B407, MSGBOX_DEFAULT release end Route114_LanettesHouse_EventScript_22B309:: @ 822B309 lockall - msgbox Route114_LanettesHouse_Text_22B485, 5 + msgbox Route114_LanettesHouse_Text_22B485, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route114_LanettesHouse_EventScript_22B327 - msgbox Route114_LanettesHouse_Text_22B6E4, 4 + msgbox Route114_LanettesHouse_Text_22B6E4, MSGBOX_DEFAULT releaseall end Route114_LanettesHouse_EventScript_22B327:: @ 822B327 - msgbox Route114_LanettesHouse_Text_22B53C, 5 + msgbox Route114_LanettesHouse_Text_22B53C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_22B33C releaseall end Route114_LanettesHouse_EventScript_22B33C:: @ 822B33C - msgbox Route114_LanettesHouse_Text_22B5EF, 4 + msgbox Route114_LanettesHouse_Text_22B5EF, MSGBOX_DEFAULT return Route114_LanettesHouse_EventScript_22B345:: @ 822B345 - msgbox Route114_LanettesHouse_Text_22B6FC, 3 + msgbox Route114_LanettesHouse_Text_22B6FC, MSGBOX_SIGN end Route114_LanettesHouse_Text_22B34E: @ 822B34E .string "LANETTE: Oh! {PLAYER}{KUN}!\p" - .string "I’m sorry everything is so cluttered…\n" + .string "I'm sorry everything is so cluttered…\n" .string "When I get engrossed in research,\l" .string "things end up this way…\p" .string "This is embarrassing… Please keep\n" @@ -64,8 +64,8 @@ Route114_LanettesHouse_Text_22B407: @ 822B407 .string "can tell which POKéMON are in them.$" Route114_LanettesHouse_Text_22B485: @ 822B485 - .string "It’s LANETTE’s research notes.\n" - .string "There’s information about BOXES.\p" + .string "It's LANETTE's research notes.\n" + .string "There's information about BOXES.\p" .string "Design BOXES to hold 30 POKéMON each.\p" .string "Each TRAINER should be able to store\n" .string "420 POKéMON on the PC system.\p" @@ -92,7 +92,7 @@ Route114_LanettesHouse_Text_22B6E4: @ 822B6E4 .string "{PLAYER} closed the notebook.$" Route114_LanettesHouse_Text_22B6FC: @ 822B6FC - .string "There’s an e-mail from someone on\n" + .string "There's an e-mail from someone on\n" .string "the PC.\p" .string "“… … … … … … …\p" .string "“Your Storage System offers more\n" @@ -101,7 +101,7 @@ Route114_LanettesHouse_Text_22B6FC: @ 822B6FC .string "that make it fun and useful, too.\p" .string "“It makes me proud that I played\n" .string "a part in its development.\p" - .string "“Here’s hoping that you’ll continue\n" + .string "“Here's hoping that you'll continue\n" .string "research in Storage Systems.\p" .string "“From BILL\n" .string "… … … … … … … …”$" diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 967f2f9ce..6c74a0d5a 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -25,132 +25,123 @@ Route115_MapScript2_1F2969: @ 81F2969 .2byte 0 Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, 2 + msgbox Route115_Text_1F2B55, MSGBOX_NPC end Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, 3 + msgbox Route115_Text_1F2BC9, MSGBOX_SIGN end Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, 3 + msgbox Route115_Text_1F2BE3, MSGBOX_SIGN end Route115_EventScript_1F298E:: @ 81F298E - trainerbattle 2, TRAINER_TIMOTHY_1, 0, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, 4 + msgbox Route115_Text_29B258, MSGBOX_DEFAULT release end Route115_EventScript_1F29BA:: @ 81F29BA special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B2B3, 4 - setvar VAR_0x8004, 307 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 307 - callstd 8 + msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT + register_matchcall TRAINER_TIMOTHY_1 release end Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, 6 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 + msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE end Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, 6 + trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED + msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle 2, TRAINER_NOB_1, 0, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 + trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, 4 + msgbox Route115_Text_29B49D, MSGBOX_DEFAULT release end Route115_EventScript_1F2A33:: @ 81F2A33 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B50B, 4 - setvar VAR_0x8004, 183 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 183 - callstd 8 + msgbox Route115_Text_29B50B, MSGBOX_DEFAULT + register_matchcall TRAINER_NOB_1 release end Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, 6 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D + msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle 2, TRAINER_CYNDY_1, 0, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, 4 + msgbox Route115_Text_29B647, MSGBOX_DEFAULT release end Route115_EventScript_1F2A95:: @ 81F2A95 special sub_80B4808 waitmovement 0 - msgbox Route115_Text_29B6AB, 4 - setvar VAR_0x8004, 427 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 427 - callstd 8 + msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT + register_matchcall TRAINER_CYNDY_1 release end Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, 6 + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A + msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle 0, TRAINER_HECTOR, 0, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, 6 + trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 + msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle 0, TRAINER_KYRA, 0, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, 6 + trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D + msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle 0, TRAINER_JAIDEN, 0, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, 6 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 + msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle 0, TRAINER_ALIX, 0, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, 6 + trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 + msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle 0, TRAINER_HELENE, 0, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, 6 + trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 + msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE end Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle 0, TRAINER_MARLENE, 0, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, 6 + trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 + msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE end Route115_Text_1F2B55: @ 81F2B55 - .string "Exploring a cave isn’t like walking\n" + .string "Exploring a cave isn't like walking\n" .string "on a road.\p" .string "You never know when wild POKéMON will\n" - .string "appear. It’s full of suspense.$" + .string "appear. It's full of suspense.$" Route115_Text_1F2BC9: @ 81F2BC9 .string "ROUTE 115\n" diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index a2bf4d9e0..2ad7ea58b 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -37,17 +37,17 @@ Route116_EventScript_1F2C70:: @ 81F2C70 goto_eq Route116_EventScript_1F2C8E checkflag FLAG_0x08E goto_eq Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, 4 + msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, 4 + msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT release end Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, 4 + msgbox Route116_Text_1F3166, MSGBOX_DEFAULT release end @@ -56,7 +56,7 @@ Route116_EventScript_1F2CA2:: @ 81F2CA2 faceplayer checkflag FLAG_0x11F goto_eq Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, 4 + msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end @@ -65,7 +65,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, 4 + msgbox Route116_Text_1F3521, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route116_EventScript_1F2D15 @@ -92,12 +92,12 @@ Route116_EventScript_1F2D20:: @ 81F2D20 return Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, 4 + msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, 4 + msgbox Route116_Text_1F3593, MSGBOX_DEFAULT release end @@ -126,29 +126,29 @@ Route116_Movement_1F2D4C: @ 81F2D4C step_end Route116_EventScript_1F2D57:: @ 81F2D57 - msgbox Route116_Text_1F379D, 3 + msgbox Route116_Text_1F379D, MSGBOX_SIGN end Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, 3 + msgbox Route116_Text_1F37B7, MSGBOX_SIGN end Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, 3 + msgbox Route116_Text_1F380F, MSGBOX_SIGN end Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, 3 + msgbox Route116_Text_1F3825, MSGBOX_SIGN end Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, 3 + msgbox Route116_Text_1F38D4, MSGBOX_SIGN end Route116_EventScript_1F2D84:: @ 81F2D84 lock faceplayer - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 release end @@ -158,7 +158,7 @@ Route116_EventScript_1F2D95:: @ 81F2D95 applymovement 11, Route116_Movement_2725A8 applymovement 255, Route116_Movement_2725A4 waitmovement 0 - msgbox Route116_Text_1F309D, 4 + msgbox Route116_Text_1F309D, MSGBOX_DEFAULT setvar VAR_0x406F, 2 releaseall end @@ -172,28 +172,28 @@ Route116_EventScript_1F2DB6:: @ 81F2DB6 specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT release end Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, 4 + msgbox Route116_Text_1F3718, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, 4 - msgbox Route116_Text_1F3688, 4 + msgbox Route116_Text_1F3657, MSGBOX_DEFAULT + msgbox Route116_Text_1F3688, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, 4 + msgbox Route116_Text_1F375E, MSGBOX_DEFAULT release end Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, 4 + msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT closemessage goto Route116_EventScript_1F2E2A end @@ -248,17 +248,17 @@ Route116_Movement_1F2E7E: @ 81F2E7E step_end Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, 6 + trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A + msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, 6 + trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 + msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle 2, TRAINER_JERRY_1, 0, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 + trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F2F4E @@ -266,7 +266,7 @@ Route116_EventScript_1F2EB7:: @ 81F2EB7 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end @@ -279,47 +279,41 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8 Route116_EventScript_1F2F03:: @ 81F2F03 special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29BE71, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 + msgbox Route116_Text_29BE71, MSGBOX_DEFAULT + register_matchcall TRAINER_JERRY_1 release end Route116_EventScript_1F2F22:: @ 81F2F22 checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, 4 + msgbox Route116_Text_29BD92, MSGBOX_DEFAULT release end Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, 4 - setvar VAR_0x8004, 273 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 273 - callstd 8 + msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT + register_matchcall TRAINER_JERRY_1 release end Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, 6 + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C + msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, 6 + trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F + msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, 6 + trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 + msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE end Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle 2, TRAINER_KAREN_1, 0, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 + trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route116_EventScript_1F302A @@ -327,7 +321,7 @@ Route116_EventScript_1F2F93:: @ 81F2F93 specialvar VAR_RESULT, sub_813B4E0 compare VAR_RESULT, 0 goto_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end @@ -340,53 +334,47 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4 Route116_EventScript_1F2FDF:: @ 81F2FDF special sub_80B4808 waitmovement 0 - msgbox Route116_Text_29C096, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 + msgbox Route116_Text_29C096, MSGBOX_DEFAULT + register_matchcall TRAINER_KAREN_1 release end Route116_EventScript_1F2FFE:: @ 81F2FFE checkflag FLAG_HAS_MATCH_CALL goto_eq Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, 4 + msgbox Route116_Text_29C010, MSGBOX_DEFAULT release end Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, 4 - setvar VAR_0x8004, 280 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 280 - callstd 8 + msgbox Route116_Text_29C052, MSGBOX_DEFAULT + register_matchcall TRAINER_KAREN_1 release end Route116_EventScript_1F302A:: @ 81F302A - trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, 6 + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F + msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle 0, TRAINER_SARAH, 0, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, 6 + trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 + msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle 0, TRAINER_DAWSON, 0, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, 6 + trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 + msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE end Route116_EventScript_1F306F:: @ 81F306F - trainerbattle 0, TRAINER_DEVAN, 0, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, 6 + trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 + msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE end Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle 0, TRAINER_JOHNSON, 0, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, 6 + trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 + msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE end Route116_Text_1F309D: @ 81F309D @@ -403,15 +391,15 @@ Route116_Text_1F3140: @ 81F3140 Route116_Text_1F3166: @ 81F3166 .string "Nnn… Roar!\n" - .string "What’s going on?\p" + .string "What's going on?\p" .string "I was digging the tunnel without any\n" .string "tools when some goon ordered me out!\p" - .string "That tunnel’s filled with POKéMON\n" + .string "That tunnel's filled with POKéMON\n" .string "that react badly to loud noises.\l" .string "They could cause an uproar.\p" - .string "That’s why we stopped using heavy\n" + .string "That's why we stopped using heavy\n" .string "equipment for tunneling…\p" - .string "I’m worried that the goon will do\n" + .string "I'm worried that the goon will do\n" .string "something stupid and startle the\l" .string "POKéMON into an uproar.$" @@ -421,8 +409,8 @@ Route116_Text_1F32C1: @ 81F32C1 .string "the tunnel! I can go back to digging!$" Route116_Text_1F3317: @ 81F3317 - .string "Oh! It’s you!\p" - .string "You’re that person who not only helped\n" + .string "Oh! It's you!\p" + .string "You're that person who not only helped\n" .string "me in PETALBURG WOODS, but also got\l" .string "back my stolen package and then even\l" .string "graciously delivered it to SLATEPORT!\p" @@ -447,7 +435,7 @@ Route116_Text_1F3521: @ 81F3521 Route116_Text_1F3593: @ 81F3593 .string "Your BAG is jam-packed.\n" - .string "I can’t give you this REPEAT BALL.$" + .string "I can't give you this REPEAT BALL.$" Route116_Text_1F35CE: @ 81F35CE .string "As a token of our appreciation for\n" @@ -466,19 +454,19 @@ Route116_Text_1F3688: @ 81F3688 Route116_Text_1F36B4: @ 81F36B4 .string "Hmm…\n" .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…\p" - .string "Maybe my glasses aren’t around\n" + .string "They're not what I'm looking for…\p" + .string "Maybe my glasses aren't around\n" .string "here…$" Route116_Text_1F3718: @ 81F3718 .string "Hmm…\n" - .string "I can’t find my glasses anywhere…\l" - .string "Maybe they’re not around here…$" + .string "I can't find my glasses anywhere…\l" + .string "Maybe they're not around here…$" Route116_Text_1F375E: @ 81F375E .string "Hmm…\n" .string "These are BLACKGLASSES.\l" - .string "They’re not what I’m looking for…$" + .string "They're not what I'm looking for…$" Route116_Text_1F379D: @ 81F379D .string "ROUTE 116\n" @@ -491,7 +479,7 @@ Route116_Text_1F37B7: @ 81F37B7 .string "canceled.”$" Route116_Text_1F380F: @ 81F380F - .string "TUNNELER’S REST HOUSE$" + .string "TUNNELER'S REST HOUSE$" Route116_Text_1F3825: @ 81F3825 .string "TRAINER TIPS\p" diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc index b2c009337..af5a96675 100644 --- a/data/maps/Route116_TunnelersRestHouse/scripts.inc +++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc @@ -7,11 +7,11 @@ Route116_TunnelersRestHouse_MapScript1_22B856: @ 822B856 end Route116_TunnelersRestHouse_EventScript_22B85A:: @ 822B85A - msgbox Route116_TunnelersRestHouse_Text_22B88B, 2 + msgbox Route116_TunnelersRestHouse_Text_22B88B, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B863:: @ 822B863 - msgbox Route116_TunnelersRestHouse_Text_22B99F, 2 + msgbox Route116_TunnelersRestHouse_Text_22B99F, MSGBOX_NPC end Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C @@ -19,12 +19,12 @@ Route116_TunnelersRestHouse_EventScript_22B86C:: @ 822B86C faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq Route116_TunnelersRestHouse_EventScript_22B881 - msgbox Route116_TunnelersRestHouse_Text_22BAAF, 4 + msgbox Route116_TunnelersRestHouse_Text_22BAAF, MSGBOX_DEFAULT release end Route116_TunnelersRestHouse_EventScript_22B881:: @ 822B881 - msgbox Route116_TunnelersRestHouse_Text_22BB3B, 4 + msgbox Route116_TunnelersRestHouse_Text_22BB3B, MSGBOX_DEFAULT release end @@ -36,22 +36,22 @@ Route116_TunnelersRestHouse_Text_22B88B: @ 822B88B .string "It turns out that we would have had\n" .string "a negative effect on wild POKéMON in\l" .string "the area.\p" - .string "So, we’ve got nothing to do but loll\n" + .string "So, we've got nothing to do but loll\n" .string "around here doing nothing.$" Route116_TunnelersRestHouse_Text_22B99F: @ 822B99F - .string "There’s a man digging his way to\n" + .string "There's a man digging his way to\n" .string "VERDANTURF all by his lonesome.\l" - .string "He’s desperate to get through.\p" + .string "He's desperate to get through.\p" .string "He says that if he digs little by little\n" - .string "without using machines, he won’t\l" - .string "disturb POKéMON, and he’ll avoid\l" + .string "without using machines, he won't\l" + .string "disturb POKéMON, and he'll avoid\l" .string "harming the natural environment.\p" .string "I wonder if he made it through yet.$" Route116_TunnelersRestHouse_Text_22BAAF: @ 822BAAF .string "To get to VERDANTURF without using\n" - .string "this TUNNEL, you’d have to cross the\l" + .string "this TUNNEL, you'd have to cross the\l" .string "sea to DEWFORD, sail on to SLATEPORT,\l" .string "then travel through MAUVILLE.$" diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index eb04664bd..1dbc7167e 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -15,204 +15,186 @@ Route117_EventScript_1F3999:: @ 81F3999 return Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, 2 + msgbox Route117_Text_1F3CFD, MSGBOX_NPC end Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, 2 + msgbox Route117_Text_1F3D41, MSGBOX_NPC end Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, 2 + msgbox Route117_Text_1F3C7C, MSGBOX_NPC end Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, 3 + msgbox Route117_Text_1F3D58, MSGBOX_SIGN end Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, 3 + msgbox Route117_Text_1F3D74, MSGBOX_SIGN end Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, 3 + msgbox Route117_Text_1F3D8E, MSGBOX_SIGN end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, 4 + msgbox Route117_Text_29C498, MSGBOX_DEFAULT release end Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C508, 4 - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd 8 + msgbox Route117_Text_29C508, MSGBOX_DEFAULT + register_matchcall TRAINER_ISAAC_1 release end Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, 6 + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B + msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, 4 + msgbox Route117_Text_29C679, MSGBOX_DEFAULT release end Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C6BC, 4 - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd 8 + msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT + register_matchcall TRAINER_LYDIA_1 release end Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, 6 + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E + msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, 4 + msgbox Route117_Text_29C800, MSGBOX_DEFAULT release end Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29C846, 4 - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd 8 + msgbox Route117_Text_29C846, MSGBOX_DEFAULT + register_matchcall TRAINER_DYLAN_1 release end Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, 6 + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3 + msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, 4 + msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT release end Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 - msgbox Route117_Text_29CA32, 4 - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd 8 + msgbox Route117_Text_29CA32, MSGBOX_DEFAULT + register_matchcall TRAINER_MARIA_1 release end Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, 6 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC + msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, 6 + trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 + msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, 4 + msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT release end Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT + register_matchcall TRAINER_ANNA_AND_MEG_1 release end Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, 4 + msgbox Route117_Text_29CE17, MSGBOX_DEFAULT release end Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, 4 - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd 8 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT + register_matchcall TRAINER_ANNA_AND_MEG_1 release end Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, 6 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, 6 + trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 + msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, 6 + trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 + msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, 6 + trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 + msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end Route117_Text_1F3C7C: @ 81F3C7C .string "I left my POKéMON at the DAY CARE.\p" .string "When I got it back, it had a new move\n" - .string "that I didn’t teach it.\l" + .string "that I didn't teach it.\l" .string "I was really, really surprised.$" Route117_Text_1F3CFD: @ 81F3CFD .string "What do you think?\n" - .string "Aren’t these flowers pretty?\p" + .string "Aren't these flowers pretty?\p" .string "I planted them all!$" Route117_Text_1F3D41: @ 81F3D41 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 09fad07e7..8d1cf48e4 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -30,7 +30,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14 faceplayer checkflag FLAG_0x0E3 goto_eq Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, 5 + msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3E3E compare VAR_RESULT, 0 @@ -38,33 +38,33 @@ Route118_EventScript_1F3E14:: @ 81F3E14 end Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, 4 + msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_0x0E3 - msgbox Route118_Text_1F42E7, 4 + msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT release end Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, 4 + msgbox Route118_Text_1F4319, MSGBOX_DEFAULT release end Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, 4 + msgbox Route118_Text_1F4331, MSGBOX_DEFAULT release end Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, 2 + msgbox Route118_Text_1F4367, MSGBOX_NPC end Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, 3 + msgbox Route118_Text_1F43F4, MSGBOX_SIGN end Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, 3 + msgbox Route118_Text_1F440E, MSGBOX_SIGN end Route118_EventScript_1F3E8E:: @ 81F3E8E @@ -100,7 +100,7 @@ Route118_EventScript_1F3EE4:: @ 81F3EE4 applymovement 19, Route118_Movement_1F3F65 waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, 4 + msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 call_if 1, Route118_EventScript_1F3F28 @@ -187,122 +187,116 @@ Route118_Movement_1F3F7E: @ 81F3F7E step_end Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, 4 + msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT release end Route118_EventScript_1F3FB3:: @ 81F3FB3 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D343, 4 - setvar VAR_0x8004, 37 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 37 - callstd 8 + msgbox Route118_Text_29D343, MSGBOX_DEFAULT + register_matchcall TRAINER_ROSE_1 release end Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, 6 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA + msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE end Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, 6 + trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C + msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, 6 + trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C + msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, 4 + msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT release end Route118_EventScript_1F4043:: @ 81F4043 special sub_80B4808 waitmovement 0 - msgbox Route118_Text_29D74A, 4 - setvar VAR_0x8004, 196 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 196 - callstd 8 + msgbox Route118_Text_29D74A, MSGBOX_DEFAULT + register_matchcall TRAINER_DALTON_1 release end Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, 6 + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA + msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, 6 + trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B + msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE end Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, 6 + trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 + msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE end Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, 6 + trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C + msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE end Route118_Text_1F40BE: @ 81F40BE .string "STEVEN: Hi, {PLAYER}{KUN}!\p" - .string "It’s me, STEVEN!\n" + .string "It's me, STEVEN!\n" .string "We met in the cave near DEWFORD.\p" .string "Have you met many kinds of POKéMON\n" .string "since I last saw you?\p" .string "There are many, many kinds of POKéMON\n" .string "in this wide world of ours.\p" .string "If you wanted to raise only your\n" - .string "favorites, that’s fine.\p" + .string "favorites, that's fine.\p" .string "Perhaps you find it more fun to raise\n" .string "all sorts of POKéMON.\p" .string "As a TRAINER of POKéMON,\n" .string "what do you think?\p" - .string "Of course, it’s not any of my business.\p" + .string "Of course, it's not any of my business.\p" .string "It would be nice if we were to meet\n" .string "again somewhere.$" Route118_Text_1F427B: @ 81F427B .string "Hmm!\n" .string "A GOOD ROD is really good!\p" - .string "Wouldn’t you agree?$" + .string "Wouldn't you agree?$" Route118_Text_1F42AF: @ 81F42AF .string "Hmm!\n" - .string "We’re of identical minds!\p" + .string "We're of identical minds!\p" .string "Hmm!\n" .string "Take this GOOD ROD!$" Route118_Text_1F42E7: @ 81F42E7 - .string "Wherever there’s water, try your luck\n" + .string "Wherever there's water, try your luck\n" .string "at fishing.$" Route118_Text_1F4319: @ 81F4319 - .string "Don’t you like to fish?$" + .string "Don't you like to fish?$" Route118_Text_1F4331: @ 81F4331 .string "Try catching all sorts of POKéMON\n" .string "with your GOOD ROD.$" Route118_Text_1F4367: @ 81F4367 - .string "Even if there isn’t a boat, you can\n" + .string "Even if there isn't a boat, you can\n" .string "cross rivers and the sea if you have\l" .string "a POKéMON that knows SURF.\p" .string "POKéMON can be counted on to do so\n" diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index bf3abf9f8..fd1d127d1 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -79,7 +79,7 @@ Route119_EventScript_1F4506:: @ 81F4506 return Route119_EventScript_1F450B:: @ 81F450B - msgbox Route119_Text_1F49FD, 4 + msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F453A case 1, Route119_EventScript_1F454A @@ -87,29 +87,29 @@ Route119_EventScript_1F450B:: @ 81F450B end Route119_EventScript_1F453A:: @ 81F453A - trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F454A:: @ 81F454A - trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F455A:: @ 81F455A - trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_1F4A98 + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98 goto Route119_EventScript_1F456A end Route119_EventScript_1F456A:: @ 81F456A - msgbox Route119_Text_1F4AF3, 4 + msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4B56, 4 + msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end Route119_EventScript_1F4585:: @ 81F4585 - msgbox Route119_Text_1F4C9A, 4 + msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, Route119_EventScript_1F45B4 case 1, Route119_EventScript_1F45C4 @@ -117,24 +117,24 @@ Route119_EventScript_1F4585:: @ 81F4585 end Route119_EventScript_1F45B4:: @ 81F45B4 - trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45C4:: @ 81F45C4 - trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45D4:: @ 81F45D4 - trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1F4D24 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24 goto Route119_EventScript_1F45E4 end Route119_EventScript_1F45E4:: @ 81F45E4 - msgbox Route119_Text_1F4D4B, 4 + msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4DB5, 4 + msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT goto Route119_EventScript_1F460F end @@ -169,7 +169,7 @@ Route119_EventScript_1F460F:: @ 81F460F applymovement 43, Route119_Movement_1F4752 waitmovement 0 addvar VAR_0x40D1, 1 - msgbox Route119_Text_1F4E60, 4 + msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1F46B0 @@ -325,146 +325,140 @@ Route119_Movement_1F4763: @ 81F4763 step_end Route119_EventScript_1F476B:: @ 81F476B - msgbox Route119_Text_1F5261, 2 + msgbox Route119_Text_1F5261, MSGBOX_NPC end Route119_EventScript_1F4774:: @ 81F4774 - msgbox Route119_Text_1F530E, 3 + msgbox Route119_Text_1F530E, MSGBOX_SIGN end Route119_EventScript_1F477D:: @ 81F477D - msgbox Route119_Text_1F5327, 3 + msgbox Route119_Text_1F5327, MSGBOX_SIGN end Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_29D8C2, Route119_Text_29D8F0 - msgbox Route119_Text_29D902, 6 + trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 + msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE end Route119_EventScript_1F479D:: @ 81F479D - trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_29D941, Route119_Text_29D97C - msgbox Route119_Text_29D993, 6 + trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C + msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_29D9CD, Route119_Text_29DA14 - msgbox Route119_Text_29DA2C, 6 + trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 + msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_29DA7D, Route119_Text_29DABC - msgbox Route119_Text_29DADB, 6 + trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC + msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle 0, TRAINER_GREG, 0, Route119_Text_29DB17, Route119_Text_29DB66 - msgbox Route119_Text_29DB7C, 6 + trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 + msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE end Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle 0, TRAINER_KENT, 0, Route119_Text_29DBC2, Route119_Text_29DC20 - msgbox Route119_Text_29DC2B, 6 + trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 + msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle 2, TRAINER_JACKSON_1, 0, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F485B - msgbox Route119_Text_29DCC6, 4 + msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT release end Route119_EventScript_1F483C:: @ 81F483C special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DD1C, 4 - setvar VAR_0x8004, 552 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 552 - callstd 8 + msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT + register_matchcall TRAINER_JACKSON_1 release end Route119_EventScript_1F485B:: @ 81F485B - trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_29DD62, Route119_Text_29DDA5 - msgbox Route119_Text_29DDBD, 6 + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5 + msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle 2, TRAINER_CATHERINE_1, 0, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route119_EventScript_1F48BD - msgbox Route119_Text_29DE88, 4 + msgbox Route119_Text_29DE88, MSGBOX_DEFAULT release end Route119_EventScript_1F489E:: @ 81F489E special sub_80B4808 waitmovement 0 - msgbox Route119_Text_29DEF7, 4 - setvar VAR_0x8004, 559 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 559 - callstd 8 + msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT + register_matchcall TRAINER_CATHERINE_1 release end Route119_EventScript_1F48BD:: @ 81F48BD - trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_29DF6B, Route119_Text_29DF92 - msgbox Route119_Text_29DFAF, 6 + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92 + msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_29E007, Route119_Text_29E063 - msgbox Route119_Text_29E071, 6 + trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 + msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE end Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_29E0A5, Route119_Text_29E0E1 - msgbox Route119_Text_29E0F6, 6 + trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 + msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle 0, TRAINER_YASU, 0, Route119_Text_29E134, Route119_Text_29E18D - msgbox Route119_Text_29E19D, 6 + trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D + msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_29E1F5, Route119_Text_29E22B - msgbox Route119_Text_29E245, 6 + trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B + msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle 0, TRAINER_HIDEO, 0, Route119_Text_29E26A, Route119_Text_29E288 - msgbox Route119_Text_29E2A3, 6 + trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 + msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle 0, TRAINER_CHRIS, 0, Route119_Text_29E30D, Route119_Text_29E372 - msgbox Route119_Text_29E3A2, 6 + trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 + msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE end Route119_EventScript_1F495E:: @ 81F495E - trainerbattle 0, TRAINER_FABIAN, 0, Route119_Text_29E3FF, Route119_Text_29E44F - msgbox Route119_Text_29E492, 6 + trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F + msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE end Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle 0, TRAINER_DAYTON, 0, Route119_Text_29E4DF, Route119_Text_29E513 - msgbox Route119_Text_29E532, 6 + trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 + msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE end Route119_EventScript_1F498C:: @ 81F498C - trainerbattle 0, TRAINER_RACHEL, 0, Route119_Text_29E56F, Route119_Text_29E5B1 - msgbox Route119_Text_29E5CB, 6 + trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 + msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE end Route119_EventScript_1F49A3:: @ 81F49A3 lock faceplayer - msgbox Route119_Text_1F50EB, 4 + msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -474,7 +468,7 @@ Route119_EventScript_1F49A3:: @ 81F49A3 Route119_EventScript_1F49BA:: @ 81F49BA lock faceplayer - msgbox Route119_Text_1F5147, 4 + msgbox Route119_Text_1F5147, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Route119_Movement_2725A2 waitmovement 0 @@ -482,15 +476,15 @@ Route119_EventScript_1F49BA:: @ 81F49BA end Route119_EventScript_1F49D1:: @ 81F49D1 - msgbox Route119_Text_1F51A2, 2 + msgbox Route119_Text_1F51A2, MSGBOX_NPC end Route119_EventScript_1F49DA:: @ 81F49DA - msgbox Route119_Text_1F52B9, 2 + msgbox Route119_Text_1F52B9, MSGBOX_NPC end Route119_EventScript_1F49E3:: @ 81F49E3 - msgbox Route119_Text_1F5339, 3 + msgbox Route119_Text_1F5339, MSGBOX_SIGN end Route119_EventScript_1F49EC:: @ 81F49EC @@ -512,7 +506,7 @@ Route119_Text_1F49FD: @ 81F49FD Route119_Text_1F4A98: @ 81F4A98 .string "Achah!\n" - .string "{PLAYER}{KUN}, you’re strong!\p" + .string "{PLAYER}{KUN}, you're strong!\p" .string "I was worried that you might be\n" .string "struggling with your training.$" @@ -523,39 +517,39 @@ Route119_Text_1F4AF3: @ 81F4AF3 Route119_Text_1F4B56: @ 81F4B56 .string "MAY: Use FLY, and your POKéMON will\n" - .string "instantly carry you to any town you’ve\l" + .string "instantly carry you to any town you've\l" .string "already visited.\p" .string "But, to use FLY, you have to get\n" .string "the GYM BADGE from FORTREE CITY.\l" - .string "That’s important, so don’t forget.\p" + .string "That's important, so don't forget.\p" .string "You should FLY home and visit\n" .string "LITTLEROOT for a change.\p" - .string "I bet your mom’s worried about you,\n" + .string "I bet your mom's worried about you,\n" .string "{PLAYER}{KUN}.\p" - .string "Well, let’s meet again somewhere!$" + .string "Well, let's meet again somewhere!$" Route119_Text_1F4C9A: @ 81F4C9A .string "BRENDAN: {PLAYER}! So this is where\n" - .string "you’ve been looking for POKéMON?\p" + .string "you've been looking for POKéMON?\p" .string "Let me see how good you got.\n" - .string "I’ll test you!\p" + .string "I'll test you!\p" .string "Now!\n" - .string "It’s a battle, so battle!$" + .string "It's a battle, so battle!$" Route119_Text_1F4D24: @ 81F4D24 .string "Hmm…\n" - .string "You’ve gotten pretty darn decent.$" + .string "You've gotten pretty darn decent.$" Route119_Text_1F4D4B: @ 81F4D4B - .string "BRENDAN: I’d say you’re good enough\n" + .string "BRENDAN: I'd say you're good enough\n" .string "to search for POKéMON anywhere.\p" - .string "Here, I’ll give you this.\n" + .string "Here, I'll give you this.\n" .string "Try it out.$" Route119_Text_1F4DB5: @ 81F4DB5 .string "BRENDAN: Use FLY, and your POKéMON\n" .string "instantly carries you to any town\l" - .string "you’ve already visited.\p" + .string "you've already visited.\p" .string "But you need the FORTREE GYM BADGE \n" .string "to do that.\p" .string "Anyway, I have to move along.$" @@ -565,55 +559,55 @@ Route119_Text_1F4E60: @ 81F4E60 .string "Way to go, {PLAYER}{KUN}!\p" .string "I just passed by a TRAINER riding\n" .string "a BIKE.\p" - .string "You just beat that TRAINER, didn’t you?\n" + .string "You just beat that TRAINER, didn't you?\n" .string "It was pretty obvious that you did.\p" .string "The kid looked really upset with\n" .string "a face all red from anger.\p" .string "I sure seem to run into you often.\n" .string "Are you off to FORTREE GYM next?\p" - .string "I expect that you’ll do well at the GYM.\n" - .string "Well, I’ll be seeing you!$" + .string "I expect that you'll do well at the GYM.\n" + .string "Well, I'll be seeing you!$" Route119_Text_1F4FBA: @ 81F4FBA .string "… … … … … …\n" .string "… … … … … Beep!\p" - .string "SCOTT: Hiya, {PLAYER}{KUN}, it’s me!\p" + .string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p" .string "Just as I thought, you won at\n" .string "the FORTREE GYM.\p" .string "Your strength…\n" .string "Perhaps you really are the TRAINER\l" - .string "that I’ve been searching for.\p" + .string "that I've been searching for.\p" .string "Remember, you have a fan in me.\n" - .string "I’ll be cheering from the sidelines.\l" + .string "I'll be cheering from the sidelines.\l" .string "Keep up the great work!\p" .string "… … … … … …\n" .string "… … … … … Click!$" Route119_Text_1F50EB: @ 81F50EB - .string "We’re standing lookout here.\p" + .string "We're standing lookout here.\p" .string "Hey, you! Stay away from the WEATHER\n" - .string "INSTITUTE. It’s not safe.$" + .string "INSTITUTE. It's not safe.$" Route119_Text_1F5147: @ 81F5147 .string "Lookout duty is surprisingly boring.\p" - .string "Hey, you! Please don’t go near the\n" + .string "Hey, you! Please don't go near the\n" .string "WEATHER INSTITUTE.$" Route119_Text_1F51A2: @ 81F51A2 .string "I thought you FLY by catching a whole\n" .string "flock of BIRD POKéMON, and then\l" .string "hanging on to them somehow.\p" - .string "But it turns out there’s an HM move\n" + .string "But it turns out there's an HM move\n" .string "called FLY!\p" - .string "I wish I’d known about that a long\n" + .string "I wish I'd known about that a long\n" .string "time ago…$" Route119_Text_1F5261: @ 81F5261 .string "Tch…\n" - .string "It’s a no-go…\p" + .string "It's a no-go…\p" .string "The tall grass snares BIKE tires.\n" - .string "There’s no way you can cycle here.$" + .string "There's no way you can cycle here.$" Route119_Text_1F52B9: @ 81F52B9 .string "Can your POKéMON use its SECRET POWER\n" diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc index 5e633437d..4d4826bdf 100644 --- a/data/maps/Route119_House/scripts.inc +++ b/data/maps/Route119_House/scripts.inc @@ -2,7 +2,7 @@ Route119_House_MapScripts:: @ 8270965 .byte 0 Route119_House_EventScript_270966:: @ 8270966 - msgbox Route119_House_Text_270982, 2 + msgbox Route119_House_Text_270982, MSGBOX_NPC end Route119_House_EventScript_27096F:: @ 827096F @@ -10,7 +10,7 @@ Route119_House_EventScript_27096F:: @ 827096F faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox Route119_House_Text_270A17, 4 + msgbox Route119_House_Text_270A17, MSGBOX_DEFAULT waitmoncry release end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b008f52c0..3b36baf91 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -18,12 +18,12 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 special GetPlayerBigGuyGirlString compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCE5, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FABE:: @ 826FABE - msgbox Route119_WeatherInstitute_1F_Text_26FCB7, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FCB7, MSGBOX_DEFAULT release end @@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 goto_eq Route119_WeatherInstitute_1F_EventScript_26FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FDE8, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT release end @@ -48,30 +48,30 @@ Route119_WeatherInstitute_1F_EventScript_26FAFF:: @ 826FAFF return Route119_WeatherInstitute_1F_EventScript_26FB05:: @ 826FB05 - msgbox Route119_WeatherInstitute_1F_Text_26FD2E, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FD2E, MSGBOX_DEFAULT release end Route119_WeatherInstitute_1F_EventScript_26FB0F:: @ 826FB0F - msgbox Route119_WeatherInstitute_1F_Text_26FE94, 2 + msgbox Route119_WeatherInstitute_1F_Text_26FE94, MSGBOX_NPC end Route119_WeatherInstitute_1F_EventScript_26FB18:: @ 826FB18 lockall - msgbox Route119_WeatherInstitute_1F_Text_26FEFC, 4 + msgbox Route119_WeatherInstitute_1F_Text_26FEFC, MSGBOX_DEFAULT closemessage call Route119_WeatherInstitute_1F_EventScript_272083 releaseall end Route119_WeatherInstitute_1F_EventScript_26FB29:: @ 826FB29 - trainerbattle 0, TRAINER_GRUNT_11, 0, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB - msgbox Route119_WeatherInstitute_1F_Text_26FBD7, 6 + trainerbattle_single TRAINER_GRUNT_11, Route119_WeatherInstitute_1F_Text_26FB57, Route119_WeatherInstitute_1F_Text_26FBBB + msgbox Route119_WeatherInstitute_1F_Text_26FBD7, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_EventScript_26FB40:: @ 826FB40 - trainerbattle 0, TRAINER_GRUNT_20, 0, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 - msgbox Route119_WeatherInstitute_1F_Text_26FC60, 6 + trainerbattle_single TRAINER_GRUNT_20, Route119_WeatherInstitute_1F_Text_26FC34, Route119_WeatherInstitute_1F_Text_26FC52 + msgbox Route119_WeatherInstitute_1F_Text_26FC60, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_1F_Text_26FB57: @ 826FB57 @@ -86,12 +86,12 @@ Route119_WeatherInstitute_1F_Text_26FBBB: @ 826FBBB Route119_WeatherInstitute_1F_Text_26FBD7: @ 826FBD7 .string "Our BOSS knows everything.\p" - .string "But I’m just a GRUNT. What would I know\n" - .string "about what he’s thinking?$" + .string "But I'm just a GRUNT. What would I know\n" + .string "about what he's thinking?$" Route119_WeatherInstitute_1F_Text_26FC34: @ 826FC34 .string "Huh?\n" - .string "What’s a kid doing here?$" + .string "What's a kid doing here?$" Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 .string "Huh?\n" @@ -99,7 +99,7 @@ Route119_WeatherInstitute_1F_Text_26FC52: @ 826FC52 Route119_WeatherInstitute_1F_Text_26FC60: @ 826FC60 .string "Oh, no…\n" - .string "I’ll catch an earful for losing to a kid…\p" + .string "I'll catch an earful for losing to a kid…\p" .string "I should just take a nap in the bed…$" Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 @@ -107,15 +107,15 @@ Route119_WeatherInstitute_1F_Text_26FCB7: @ 826FCB7 .string "upstairs!$" Route119_WeatherInstitute_1F_Text_26FCE5: @ 826FCE5 - .string "Wow, you’re really strong!\p" + .string "Wow, you're really strong!\p" .string "I wish I could be a POKéMON TRAINER\n" .string "like you!$" Route119_WeatherInstitute_1F_Text_26FD2E: @ 826FD2E .string "The PROFESSOR loves rain.\n" - .string "That’s a fact.\p" + .string "That's a fact.\p" .string "But if it keeps raining, people will be in\n" - .string "trouble. That’s another fact.\p" + .string "trouble. That's another fact.\p" .string "And thus, the PROFESSOR is studying\n" .string "if the rain can be put to good use.$" @@ -123,17 +123,17 @@ Route119_WeatherInstitute_1F_Text_26FDE8: @ 826FDE8 .string "On the 2nd floor of the INSTITUTE,\n" .string "we study the weather patterns over\l" .string "the HOENN region.\p" - .string "We’ve been noticing temporary and\n" + .string "We've been noticing temporary and\n" .string "isolated cases of droughts and\l" .string "heavy rain lately…$" Route119_WeatherInstitute_1F_Text_26FE94: @ 826FE94 .string "Hello!\n" - .string "We’ve been saved by your actions!\p" - .string "What I don’t understand is what on\n" + .string "We've been saved by your actions!\p" + .string "What I don't understand is what on\n" .string "earth the AQUAS were up to.$" Route119_WeatherInstitute_1F_Text_26FEFC: @ 826FEFC - .string "There’s a bed…\n" - .string "Let’s take a rest.$" + .string "There's a bed…\n" + .string "Let's take a rest.$" diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index fb0c4ca54..35dd538df 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -27,40 +27,40 @@ Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 - trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F - msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6 + trainerbattle_single TRAINER_GRUNT_37, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F + msgbox Route119_WeatherInstitute_2F_Text_2703C0, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F - trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 - msgbox Route119_WeatherInstitute_2F_Text_27022B, 6 + trainerbattle_single TRAINER_GRUNT_12, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208 + msgbox Route119_WeatherInstitute_2F_Text_27022B, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96 - trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE - msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6 + trainerbattle_single TRAINER_GRUNT_13, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE + msgbox Route119_WeatherInstitute_2F_Text_2702DA, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD - trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6 + trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_AUTOCLOSE end Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 - msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4 + msgbox Route119_WeatherInstitute_2F_Text_2704E4, MSGBOX_DEFAULT closemessage addobject 7 applymovement 7, Route119_WeatherInstitute_2F_Movement_270170 applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_270568, 4 + msgbox Route119_WeatherInstitute_2F_Text_270568, MSGBOX_DEFAULT closemessage playse SE_PIN applymovement 3, Route119_WeatherInstitute_2F_Movement_272598 waitmovement 0 applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A waitmovement 0 - msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 + msgbox Route119_WeatherInstitute_2F_Text_2705DD, MSGBOX_DEFAULT closemessage setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS @@ -83,7 +83,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 end Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D - msgbox Route119_WeatherInstitute_2F_Text_270650, 4 + msgbox Route119_WeatherInstitute_2F_Text_270650, MSGBOX_DEFAULT setvar VAR_TEMP_1, 385 givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 compare VAR_RESULT, 0 @@ -95,7 +95,7 @@ Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA call Route119_WeatherInstitute_2F_EventScript_27378B @@ -105,7 +105,7 @@ Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085 Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD call Route119_WeatherInstitute_2F_EventScript_2700DB - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0 call Route119_WeatherInstitute_2F_EventScript_273797 @@ -126,7 +126,7 @@ Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB return Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA - msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4 + msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT setflag FLAG_0x097 release end @@ -134,7 +134,7 @@ Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 checkflag FLAG_SYS_GAME_CLEAR goto_eq Route119_WeatherInstitute_2F_EventScript_27010A - msgbox Route119_WeatherInstitute_2F_Text_27077E, 4 + msgbox Route119_WeatherInstitute_2F_Text_27077E, MSGBOX_DEFAULT release end @@ -151,12 +151,12 @@ Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A specialvar VAR_RESULT, sub_813B374 compare VAR_RESULT, 1 goto_eq Route119_WeatherInstitute_2F_EventScript_27014F - msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4 + msgbox Route119_WeatherInstitute_2F_Text_2707F1, MSGBOX_DEFAULT release end Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F - msgbox Route119_WeatherInstitute_2F_Text_270873, 4 + msgbox Route119_WeatherInstitute_2F_Text_270873, MSGBOX_DEFAULT release end @@ -170,7 +170,7 @@ Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160 return Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 - msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4 + msgbox Route119_WeatherInstitute_2F_Text_2708FC, MSGBOX_DEFAULT release end @@ -220,10 +220,10 @@ Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B Route119_WeatherInstitute_2F_Text_27019C: @ 827019C .string "The INSTITUTE created a type of\n" .string "POKéMON that has something to do with\l" - .string "the weather. We’re here to take them!$" + .string "the weather. We're here to take them!$" Route119_WeatherInstitute_2F_Text_270208: @ 8270208 - .string "Our plan’s being spoiled by a kid?$" + .string "Our plan's being spoiled by a kid?$" Route119_WeatherInstitute_2F_Text_27022B: @ 827022B .string "If the POKéMON they made here can\n" @@ -231,7 +231,7 @@ Route119_WeatherInstitute_2F_Text_27022B: @ 827022B .string "TEAM AQUA definitely need it!$" Route119_WeatherInstitute_2F_Text_270292: @ 8270292 - .string "We’re TEAM AQUA!\n" + .string "We're TEAM AQUA!\n" .string "We appear wherever anything rare is\l" .string "found!$" @@ -239,14 +239,14 @@ Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE .string "You got me!$" Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA - .string "You don’t have any idea what we of\n" + .string "You don't have any idea what we of\n" .string "TEAM AQUA are working towards!\l" .string "You stay out of our way!$" Route119_WeatherInstitute_2F_Text_270335: @ 8270335 - .string "Don’t tell me you’re looking for that\n" + .string "Don't tell me you're looking for that\n" .string "weather POKéMON, too?\p" - .string "That’s a no-no!\n" + .string "That's a no-no!\n" .string "We were here to get it first!$" Route119_WeatherInstitute_2F_Text_27039F: @ 827039F @@ -255,25 +255,25 @@ Route119_WeatherInstitute_2F_Text_27039F: @ 827039F Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0 .string "Humph, so what?\n" .string "What we want…\p" - .string "What we really want isn’t here…\n" + .string "What we really want isn't here…\n" .string "Ihihihihi…$" Route119_WeatherInstitute_2F_Text_270409: @ 8270409 .string "Ahahahaha!\p" - .string "You’re going to meddle in TEAM AQUA’s\n" + .string "You're going to meddle in TEAM AQUA's\n" .string "affairs?\p" - .string "You’re either absolutely fearless,\n" + .string "You're either absolutely fearless,\n" .string "simply ignorant, or both!\p" - .string "You’re so cute, you’re disgusting!\n" - .string "I’ll put you down, kiddy!$" + .string "You're so cute, you're disgusting!\n" + .string "I'll put you down, kiddy!$" Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD .string "Ahahahaha!\n" - .string "You’re disgustingly strong!$" + .string "You're disgustingly strong!$" Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4 - .string "It’s bad enough to have TEAM MAGMA\n" - .string "blunder about, but now there’s you!\p" + .string "It's bad enough to have TEAM MAGMA\n" + .string "blunder about, but now there's you!\p" .string "What makes you want to sniff around\n" .string "in our business, anyway?$" @@ -286,19 +286,19 @@ Route119_WeatherInstitute_2F_Text_270568: @ 8270568 Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD .string "What?!\p" - .string "We can’t waste any more time here!\n" + .string "We can't waste any more time here!\n" .string "We have to hurry to MT. PYRE, too!\p" .string "Ahahahaha!\n" .string "TEAM MAGMA, just you wait!$" Route119_WeatherInstitute_2F_Text_270650: @ 8270650 .string "Thanks!\n" - .string "Thanks to you, we’re safe!\p" + .string "Thanks to you, we're safe!\p" .string "It might be an odd way of thanking you,\n" .string "but take this POKéMON.$" Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2 - .string "Hm? You don’t seem to have any room\n" + .string "Hm? You don't seem to have any room\n" .string "for this POKéMON.$" Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 @@ -307,12 +307,12 @@ Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8 Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE .string "That POKéMON changes shape according\n" .string "to the weather conditions.\p" - .string "There’re plenty of them in the\n" + .string "There're plenty of them in the\n" .string "INSTITUTE--go ahead and take it.$" Route119_WeatherInstitute_2F_Text_27077E: @ 827077E - .string "I’ve been researching rain for many\n" - .string "years, but it’s ridiculous to think that\l" + .string "I've been researching rain for many\n" + .string "years, but it's ridiculous to think that\l" .string "humans can freely change the weather.$" Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 0bcff1a93..ba16b1a2f 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -105,7 +105,7 @@ Route120_EventScript_1F5527:: @ 81F5527 dodailyevents checkflag FLAG_0x92E goto_eq Route120_EventScript_1F5625 - msgbox Route120_Text_2A70C7, 5 + msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, Route120_EventScript_1F562F compare VAR_RESULT, 0 @@ -154,21 +154,21 @@ Route120_EventScript_1F5601:: @ 81F5601 compare VAR_RESULT, 0 goto_eq Route120_EventScript_272054 setflag FLAG_0x92E - msgbox Route120_Text_2A71D5, 4 + msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release end Route120_EventScript_1F5625:: @ 81F5625 - msgbox Route120_Text_2A7217, 4 + msgbox Route120_Text_2A7217, MSGBOX_DEFAULT release end Route120_EventScript_1F562F:: @ 81F562F - msgbox Route120_Text_2A7147, 4 + msgbox Route120_Text_2A7147, MSGBOX_DEFAULT return Route120_EventScript_1F5638:: @ 81F5638 - msgbox Route120_Text_2A7183, 4 + msgbox Route120_Text_2A7183, MSGBOX_DEFAULT return Route120_EventScript_1F5641:: @ 81F5641 @@ -176,27 +176,27 @@ Route120_EventScript_1F5641:: @ 81F5641 faceplayer checkflag FLAG_0x122 goto_eq Route120_EventScript_1F5672 - msgbox Route120_Text_1F5998, 5 + msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F5665:: @ 81F5665 - msgbox Route120_Text_1F5AAC, 4 + msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT setflag FLAG_0x122 release end Route120_EventScript_1F5672:: @ 81F5672 - msgbox Route120_Text_1F5ADE, 5 + msgbox Route120_Text_1F5ADE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route120_EventScript_1F5665 goto Route120_EventScript_1F568B end Route120_EventScript_1F568B:: @ 81F568B - msgbox Route120_Text_1F5B0F, 4 + msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, Route120_EventScript_1F57A3 @@ -205,7 +205,7 @@ Route120_EventScript_1F568B:: @ 81F568B applymovement 31, Route120_Movement_2725A4 waitmovement 0 delay 20 - msgbox Route120_Text_1F5B43, 4 + msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT closemessage applymovement 30, Route120_Movement_2725A8 waitmovement 0 @@ -242,10 +242,10 @@ Route120_EventScript_1F572C:: @ 81F572C applymovement 31, Route120_Movement_2725AA applymovement 255, Route120_Movement_2725A6 waitmovement 0 - msgbox Route120_Text_1F5BAF, 4 + msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE setflag FLAG_0x11D - msgbox Route120_Text_1F5C7B, 4 + msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage applymovement 31, Route120_Movement_2725AA waitmovement 0 @@ -279,126 +279,120 @@ Route120_Movement_1F57B9: @ 81F57B9 step_end Route120_EventScript_1F57BC:: @ 81F57BC - msgbox Route120_Text_1F5D00, 2 + msgbox Route120_Text_1F5D00, MSGBOX_NPC end Route120_EventScript_1F57C5:: @ 81F57C5 - msgbox Route120_Text_1F5DCB, 3 + msgbox Route120_Text_1F5DCB, MSGBOX_SIGN end Route120_EventScript_1F57CE:: @ 81F57CE - msgbox Route120_Text_1F5DE4, 3 + msgbox Route120_Text_1F5DE4, MSGBOX_SIGN end Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_29E62D, Route120_Text_29E665 - msgbox Route120_Text_29E67A, 6 + trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 + msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE end Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle 2, TRAINER_ROBERT_1, 0, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A + trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F5839 - msgbox Route120_Text_29E726, 4 + msgbox Route120_Text_29E726, MSGBOX_DEFAULT release end Route120_EventScript_1F581A:: @ 81F581A special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29E75D, 4 - setvar VAR_0x8004, 406 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 406 - callstd 8 + msgbox Route120_Text_29E75D, MSGBOX_DEFAULT + register_matchcall TRAINER_ROBERT_1 release end Route120_EventScript_1F5839:: @ 81F5839 - trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_29E7AA, Route120_Text_29E7E1 - msgbox Route120_Text_29E804, 6 + trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1 + msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle 0, TRAINER_LORENZO, 0, Route120_Text_29E843, Route120_Text_29E884 - msgbox Route120_Text_29E8C5, 6 + trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 + msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_29E91C, Route120_Text_29E980 - msgbox Route120_Text_29E996, 6 + trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 + msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE end Route120_EventScript_1F587E:: @ 81F587E - trainerbattle 2, TRAINER_JEFFREY_1, 0, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA + trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route120_EventScript_1F58C9 - msgbox Route120_Text_29EA08, 4 + msgbox Route120_Text_29EA08, MSGBOX_DEFAULT release end Route120_EventScript_1F58AA:: @ 81F58AA special sub_80B4808 waitmovement 0 - msgbox Route120_Text_29EA31, 4 - setvar VAR_0x8004, 226 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 226 - callstd 8 + msgbox Route120_Text_29EA31, MSGBOX_DEFAULT + register_matchcall TRAINER_JEFFREY_1 release end Route120_EventScript_1F58C9:: @ 81F58C9 - trainerbattle 5, TRAINER_JEFFREY_1, 0, Route120_Text_29EA61, Route120_Text_29EA8F - msgbox Route120_Text_29EAA9, 6 + trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F + msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_29EAEF, Route120_Text_29EB53 - msgbox Route120_Text_29EB6E, 6 + trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 + msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE end Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_29EBAF, Route120_Text_29EC25 - msgbox Route120_Text_29EC41, 6 + trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 + msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE end Route120_EventScript_1F590E:: @ 81F590E - trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_29ECA6, Route120_Text_29ECEF - msgbox Route120_Text_29ED19, 6 + trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF + msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_29ED71, Route120_Text_29EDD3 - msgbox Route120_Text_29EDF7, 6 + trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 + msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE end Route120_EventScript_1F593C:: @ 81F593C - trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_29EE50, Route120_Text_29EE97 - msgbox Route120_Text_29EED4, 6 + trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 + msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle 0, TRAINER_RILEY, 0, Route120_Text_29EF08, Route120_Text_29EF63 - msgbox Route120_Text_29EF89, 6 + trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 + msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE end Route120_EventScript_1F596A:: @ 81F596A - trainerbattle 0, TRAINER_LEONEL, 0, Route120_Text_29F04F, Route120_Text_29F080 - msgbox Route120_Text_29F0A1, 6 + trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 + msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE end Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle 0, TRAINER_CALLIE, 0, Route120_Text_29EFB1, Route120_Text_29EFE1 - msgbox Route120_Text_29F002, 6 + trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 + msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE end Route120_Text_1F5998: @ 81F5998 .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" - .string "It’s been a while.\p" - .string "There’s something here that you can’t\n" + .string "It's been a while.\p" + .string "There's something here that you can't\n" .string "see, right?\p" .string "Now, if I were to use this device on\n" .string "the invisible obstacle…\p" @@ -410,7 +404,7 @@ Route120_Text_1F5998: @ 81F5998 Route120_Text_1F5AAC: @ 81F5AAC .string "STEVEN: No?\p" - .string "I’ll wait here, so you can get ready.$" + .string "I'll wait here, so you can get ready.$" Route120_Text_1F5ADE: @ 81F5ADE .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" @@ -431,7 +425,7 @@ Route120_Text_1F5BAF: @ 81F5BAF .string "Your battle style is intriguing.\p" .string "Your POKéMON have obviously grown\n" .string "since I first met you in DEWFORD.\p" - .string "I’d like you to have this\n" + .string "I'd like you to have this\n" .string "DEVON SCOPE.\p" .string "Who knows, there may be other\n" .string "concealed POKéMON.$" @@ -440,8 +434,8 @@ Route120_Text_1F5C7B: @ 81F5C7B .string "STEVEN: {PLAYER}{KUN}.\p" .string "I enjoy seeing POKéMON and TRAINERS\n" .string "who strive together.\p" - .string "I think you’re doing great.\p" - .string "Well, let’s meet again somewhere.$" + .string "I think you're doing great.\p" + .string "Well, let's meet again somewhere.$" Route119_Text_1F5D00: @ 81F5D00 Route120_Text_1F5D00: @ 81F5D00 diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index f133ffe56..2d65779e7 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -2,15 +2,15 @@ Route121_MapScripts:: @ 81F5DFC .byte 0 Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, 2 + msgbox Route121_Text_1F607F, MSGBOX_NPC end Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, 3 + msgbox Route121_Text_1F60D3, MSGBOX_SIGN end Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, 3 + msgbox Route121_Text_1F611E, MSGBOX_SIGN end Route121_EventScript_1F5E18:: @ 81F5E18 @@ -18,7 +18,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 playbgm MUS_AQA_0, 0 applymovement 13, Route121_Movement_2725B8 waitmovement 0 - msgbox Route121_Text_1F605A, 4 + msgbox Route121_Text_1F605A, MSGBOX_DEFAULT closemessage applymovement 12, Route121_Movement_1F5E59 applymovement 13, Route121_Movement_1F5E62 @@ -66,123 +66,114 @@ Route121_Movement_1F5E6B: @ 81F5E6B step_end Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, 6 + trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F + msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle 2, TRAINER_WALTER_1, 0, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 + trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, 4 + msgbox Route121_Text_29F21E, MSGBOX_DEFAULT release end Route121_EventScript_1F5EB7:: @ 81F5EB7 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F25B, 4 - setvar VAR_0x8004, 254 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 254 - callstd 8 + msgbox Route121_Text_29F25B, MSGBOX_DEFAULT + register_matchcall TRAINER_WALTER_1 release end Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, 6 + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A + msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, 6 + trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 + msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, 6 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 + msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, 6 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE + msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle 2, TRAINER_JESSICA_1, 0, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, 4 + msgbox Route121_Text_29F66F, MSGBOX_DEFAULT release end Route121_EventScript_1F5F66:: @ 81F5F66 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F69F, 4 - setvar VAR_0x8004, 127 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 127 - callstd 8 + msgbox Route121_Text_29F69F, MSGBOX_DEFAULT + register_matchcall TRAINER_JESSICA_1 release end Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, 6 + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710 + msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle 0, TRAINER_CALE, 0, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, 6 + trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B + msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle 0, TRAINER_MYLES, 0, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, 6 + trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 + msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle 0, TRAINER_PAT, 0, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, 6 + trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 + msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle 0, TRAINER_MARCEL, 0, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, 6 + trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C + msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE end Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle 2, TRAINER_CRISTIN_1, 0, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 + trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, 4 + msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT release end Route121_EventScript_1F6024:: @ 81F6024 special sub_80B4808 waitmovement 0 - msgbox Route121_Text_29F80D, 4 - setvar VAR_0x8004, 767 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 767 - callstd 8 + msgbox Route121_Text_29F80D, MSGBOX_DEFAULT + register_matchcall TRAINER_CRISTIN_1 release end Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle 5, TRAINER_CRISTIN_1, 0, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, 6 + trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8 + msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE end Route121_Text_1F605A: @ 81F605A .string "Okay!\n" - .string "We’re to move out to MT. PYRE!$" + .string "We're to move out to MT. PYRE!$" Route121_Text_1F607F: @ 81F607F .string "Ahead looms MT. PYRE…\p" diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 1973b0e9e..12fa8112e 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -26,21 +26,21 @@ Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 - msgbox Route121_SafariZoneEntrance_Text_2A4D12, 2 + msgbox Route121_SafariZoneEntrance_Text_2A4D12, MSGBOX_NPC end Route121_SafariZoneEntrance_EventScript_22BBEF:: @ 822BBEF lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_2A4E46, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4E46, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4E7E, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4E7E, MSGBOX_DEFAULT release end Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E - msgbox Route121_SafariZoneEntrance_Text_2A4EA1, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4EA1, MSGBOX_DEFAULT release end @@ -49,10 +49,10 @@ Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 applymovement 255, Route121_SafariZoneEntrance_Movement_2725A6 waitmovement 0 showmoneybox 0, 0, 0 - msgbox Route121_SafariZoneEntrance_Text_2A4F74, 5 + msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BC48 - msgbox Route121_SafariZoneEntrance_Text_2A4FD7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FD7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -65,15 +65,15 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 compare VAR_RESULT, 0 goto_eq Route121_SafariZoneEntrance_EventScript_22BCF8 playse SE_REGI - msgbox Route121_SafariZoneEntrance_Text_2A501B, 4 + msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT takemoney 0x1f4, 0 updatemoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_2A5036, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message Route121_SafariZoneEntrance_Text_2A5052 waitfanfare - msgbox Route121_SafariZoneEntrance_Text_2A506F, 4 + msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -94,7 +94,7 @@ Route121_SafariZoneEntrance_EventScript_22BCBF:: @ 822BCBF specialvar VAR_RESULT, ScriptCheckFreePokemonStorageSpace compare VAR_RESULT, 1 goto_eq Route121_SafariZoneEntrance_EventScript_22BCE9 - msgbox Route121_SafariZoneEntrance_Text_2A50E5, 4 + msgbox Route121_SafariZoneEntrance_Text_2A50E5, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -102,12 +102,12 @@ Route121_SafariZoneEntrance_EventScript_22BCE9:: @ 822BCE9 return Route121_SafariZoneEntrance_EventScript_22BCEA:: @ 822BCEA - msgbox Route121_SafariZoneEntrance_Text_2A5105, 4 + msgbox Route121_SafariZoneEntrance_Text_2A5105, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8 - msgbox Route121_SafariZoneEntrance_Text_2A4FF7, 4 + msgbox Route121_SafariZoneEntrance_Text_2A4FF7, MSGBOX_DEFAULT goto Route121_SafariZoneEntrance_EventScript_22BD06 end @@ -137,6 +137,6 @@ Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 - msgbox Route121_SafariZoneEntrance_Text_2A55BB, 3 + msgbox Route121_SafariZoneEntrance_Text_2A55BB, MSGBOX_SIGN end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 43e48b627..f2484af83 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -11,16 +11,16 @@ Route123_EventScript_1F6151:: @ 81F6151 faceplayer checkflag FLAG_0x0E8 goto_eq Route123_EventScript_1F61A0 - msgbox Route123_Text_1F641E, 4 + msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E - msgbox Route123_Text_1F645D, 4 + msgbox Route123_Text_1F645D, MSGBOX_DEFAULT giveitem_std ITEM_TM19 compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end @@ -29,160 +29,151 @@ Route123_EventScript_1F619E:: @ 81F619E end Route123_EventScript_1F61A0:: @ 81F61A0 - msgbox Route123_Text_1F64CF, 4 + msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end Route123_EventScript_1F61AA:: @ 81F61AA - msgbox Route123_Text_1F6511, 3 + msgbox Route123_Text_1F6511, MSGBOX_SIGN end Route123_EventScript_1F61B3:: @ 81F61B3 - msgbox Route123_Text_1F6529, 3 + msgbox Route123_Text_1F6529, MSGBOX_SIGN end Route123_EventScript_1F61BC:: @ 81F61BC - msgbox Route123_Text_1F6557, 3 + msgbox Route123_Text_1F6557, MSGBOX_SIGN end Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_29FBEB, Route123_Text_29FC23 - msgbox Route123_Text_29FC42, 6 + trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 + msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle 0, TRAINER_BRAXTON, 0, Route123_Text_29FC6F, Route123_Text_29FCD6 - msgbox Route123_Text_29FCF4, 6 + trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 + msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE end Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_29FD1D, Route123_Text_29FD53 - msgbox Route123_Text_29FD7B, 6 + trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 + msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F620A:: @ 81F620A - trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 + trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 - msgbox Route123_Text_29FE2A, 4 + msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT release end Route123_EventScript_1F6236:: @ 81F6236 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_29FE70, 4 - setvar VAR_0x8004, 238 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 238 - callstd 8 + msgbox Route123_Text_29FE70, MSGBOX_DEFAULT + register_matchcall TRAINER_CAMERON_1 release end Route123_EventScript_1F6255:: @ 81F6255 - trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_29FED4, Route123_Text_29FF1B - msgbox Route123_Text_29FF27, 6 + trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B + msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE end Route123_EventScript_1F626C:: @ 81F626C - trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 + trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 - msgbox Route123_Text_29FFE5, 4 + msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT release end Route123_EventScript_1F6298:: @ 81F6298 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A0027, 4 - setvar VAR_0x8004, 249 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 249 - callstd 8 + msgbox Route123_Text_2A0027, MSGBOX_DEFAULT + register_matchcall TRAINER_JACKI_1 release end Route123_EventScript_1F62B7:: @ 81F62B7 - trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_2A005E, Route123_Text_2A008D - msgbox Route123_Text_2A0099, 6 + trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D + msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62CE:: @ 81F62CE - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D - msgbox Route123_Text_2A012E, 6 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D + msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F62E9:: @ 81F62E9 - trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 - msgbox Route123_Text_2A01EE, 6 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 + msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_2A025F, Route123_Text_2A02A6 - msgbox Route123_Text_2A02C1, 6 + trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 + msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE end Route123_EventScript_1F631B:: @ 81F631B - trainerbattle 0, TRAINER_FREDRICK, 0, Route123_Text_2A060A, Route123_Text_2A0631 - msgbox Route123_Text_2A0672, 6 + trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 + msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle 0, TRAINER_ALBERTO, 0, Route123_Text_2A06AF, Route123_Text_2A0704 - msgbox Route123_Text_2A072B, 6 + trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 + msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle 0, TRAINER_ED, 0, Route123_Text_2A079B, Route123_Text_2A07F0 - msgbox Route123_Text_2A080D, 6 + trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 + msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle 0, TRAINER_KAYLEY, 0, Route123_Text_2A0902, Route123_Text_2A0943 - msgbox Route123_Text_2A096E, 6 + trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 + msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE end Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle 0, TRAINER_JONAS, 0, Route123_Text_2A0854, Route123_Text_2A088A - msgbox Route123_Text_2A08CA, 6 + trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A + msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE end Route123_EventScript_1F638E:: @ 81F638E - trainerbattle 0, TRAINER_JAZMYN, 0, Route123_Text_2A054E, Route123_Text_2A0592 - msgbox Route123_Text_2A05AC, 6 + trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 + msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle 0, TRAINER_DAVIS, 0, Route123_Text_2A04C0, Route123_Text_2A04FE - msgbox Route123_Text_2A0512, 6 + trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE + msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE end Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 + trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 - msgbox Route123_Text_2A0389, 4 + msgbox Route123_Text_2A0389, MSGBOX_DEFAULT release end Route123_EventScript_1F63E8:: @ 81F63E8 special sub_80B4808 waitmovement 0 - msgbox Route123_Text_2A03C1, 4 - setvar VAR_0x8004, 195 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 195 - callstd 8 + msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT + register_matchcall TRAINER_FERNANDO_1 release end Route123_EventScript_1F6407:: @ 81F6407 - trainerbattle 5, TRAINER_FERNANDO_1, 0, Route123_Text_2A03FB, Route123_Text_2A045A - msgbox Route123_Text_2A0487, 6 + trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A + msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE end Route123_Text_1F641E: @ 81F641E @@ -192,13 +183,13 @@ Route123_Text_1F641E: @ 81F641E Route123_Text_1F645D: @ 81F645D .string "Oh?\p" .string "You like GRASS-type POKéMON, too,\n" - .string "don’t you?\p" - .string "I’m so happy, you can have this!\n" - .string "It’s a token of our friendship.$" + .string "don't you?\p" + .string "I'm so happy, you can have this!\n" + .string "It's a token of our friendship.$" Route123_Text_1F64CF: @ 81F64CF .string "I check trees with my GRASS-type\n" - .string "POKéMON. I’m like a tree doctor.$" + .string "POKéMON. I'm like a tree doctor.$" Route123_Text_1F6511: @ 81F6511 .string "{RIGHT_ARROW} ROUTE 123\n" @@ -209,5 +200,5 @@ Route123_Text_1F6529: @ 81F6529 .string "“Forbidden to the faint of heart.”$" Route123_Text_1F6557: @ 81F6557 - .string "BERRY MASTER’S HOUSE$" + .string "BERRY MASTER'S HOUSE$" diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 9e865ad6a..3ab35b195 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -12,7 +12,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 dodailyevents checkflag FLAG_0x92D goto_eq Route123_BerryMastersHouse_EventScript_26F8B6 - msgbox Route123_BerryMastersHouse_Text_2A7386, 4 + msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -20,19 +20,19 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 setflag FLAG_0x92D - msgbox Route123_BerryMastersHouse_Text_2A7428, 4 + msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 - msgbox Route123_BerryMastersHouse_Text_2A7445, 4 + msgbox Route123_BerryMastersHouse_Text_2A7445, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26F8B6:: @ 826F8B6 - msgbox Route123_BerryMastersHouse_Text_2A749E, 4 + msgbox Route123_BerryMastersHouse_Text_2A749E, MSGBOX_DEFAULT release end @@ -42,7 +42,7 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 dodailyevents checkflag FLAG_0x931 goto_eq Route123_BerryMastersHouse_EventScript_26FA6F - msgbox Route123_BerryMastersHouse_Text_2A74E6, 4 + msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C lock @@ -54,8 +54,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 end Route123_BerryMastersHouse_EventScript_26F8F7:: @ 826F8F7 - msgbox Route123_BerryMastersHouse_Text_2A7682, 4 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A7682, MSGBOX_DEFAULT + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end @@ -75,7 +75,7 @@ Route123_BerryMastersHouse_EventScript_26F909:: @ 826F909 end Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C - msgbox Route123_BerryMastersHouse_Text_2A75D0, 4 + msgbox Route123_BerryMastersHouse_Text_2A75D0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT @@ -88,7 +88,7 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A checkflag FLAG_0x0F8 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -99,7 +99,7 @@ Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB checkflag FLAG_0x0F9 goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -110,7 +110,7 @@ Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC checkflag FLAG_0x0FA goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -121,7 +121,7 @@ Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D checkflag FLAG_0x0FB goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -132,7 +132,7 @@ Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E checkflag FLAG_0x0FC goto_eq Route123_BerryMastersHouse_EventScript_26F94C - msgbox Route123_BerryMastersHouse_Text_2A7583, 4 + msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 goto_eq Route123_BerryMastersHouse_EventScript_272054 @@ -141,13 +141,13 @@ Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E end Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 setflag FLAG_0x931 - msgbox Route123_BerryMastersHouse_Text_2A761B, 4 + msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index b21e55417..b7c40b034 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -8,110 +8,101 @@ Route124_MapScript1_1F6572: @ 81F6572 end Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, 3 + msgbox Route124_Text_1F6739, MSGBOX_SIGN end Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, 6 + trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 + msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE end Route124_EventScript_1F659C:: @ 81F659C - trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, 6 + trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC + msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE end Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF + trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, 4 + msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT release end Route124_EventScript_1F65DF:: @ 81F65DF special sub_80B4808 waitmovement 0 - msgbox Route124_Text_2A0C14, 4 - setvar VAR_0x8004, 449 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 449 - callstd 8 + msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT + register_matchcall TRAINER_JENNY_1 release end Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, 6 + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0 + msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, 6 + trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D + msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE end Route124_EventScript_1F662C:: @ 81F662C - trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, 6 + trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF + msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, 4 + msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT release end Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT + register_matchcall TRAINER_LILA_AND_ROY_1 release end Route124_EventScript_1F668C:: @ 81F668C - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, 6 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 + msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE end Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, 4 + msgbox Route124_Text_2A103E, MSGBOX_DEFAULT release end Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, 4 - setvar VAR_0x8004, 687 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 687 - callstd 8 + msgbox Route124_Text_2A109F, MSGBOX_DEFAULT + register_matchcall TRAINER_LILA_AND_ROY_1 release end Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle 7, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, 6 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 + msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F670B:: @ 81F670B - trainerbattle 0, TRAINER_DECLAN, 0, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, 6 + trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C + msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE end Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle 0, TRAINER_ISABELLA, 0, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, 6 + trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC + msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE end Route124_Text_1F6739: @ 81F6739 - .string "HUNTER’S HOUSE$" + .string "HUNTER'S HOUSE$" diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 7e64ecaff..8ac5ccf43 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -11,13 +11,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 faceplayer checkflag FLAG_0x0D9 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT setflag FLAG_0x0D9 goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end Route124_DivingTreasureHuntersHouse_EventScript_270A4E:: @ 8270A4E - msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_270FE5, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end @@ -61,7 +61,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270ACA:: @ 8270ACA return Route124_DivingTreasureHuntersHouse_EventScript_270AD0:: @ 8270AD0 - msgbox Route124_DivingTreasureHuntersHouse_Text_271098, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271098, MSGBOX_DEFAULT goto Route124_DivingTreasureHuntersHouse_EventScript_270ADE end @@ -246,7 +246,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EB1:: @ 8270EB1 Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 bufferitemname 0, VAR_0x8008 bufferitemname 1, VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271132, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_271132, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F4D checkitemspace VAR_0x8009, 1 @@ -261,28 +261,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_270EC0:: @ 8270EC0 Route124_DivingTreasureHuntersHouse_EventScript_270F01:: @ 8270F01 takeitem VAR_0x8008, 1 giveitem_std VAR_0x8009 - msgbox Route124_DivingTreasureHuntersHouse_Text_271158, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271158, MSGBOX_DEFAULT call Route124_DivingTreasureHuntersHouse_EventScript_270A72 compare VAR_TEMP_1, 0 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270F61 - msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, 5 + msgbox Route124_DivingTreasureHuntersHouse_Text_27117B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq Route124_DivingTreasureHuntersHouse_EventScript_270ADE goto Route124_DivingTreasureHuntersHouse_EventScript_270F4D end Route124_DivingTreasureHuntersHouse_EventScript_270F43:: @ 8270F43 - msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711A0, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F4D:: @ 8270F4D - msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_2711D8, MSGBOX_DEFAULT release end Route124_DivingTreasureHuntersHouse_EventScript_270F57:: @ 8270F57 - msgbox Route124_DivingTreasureHuntersHouse_Text_271027, 4 + msgbox Route124_DivingTreasureHuntersHouse_Text_271027, MSGBOX_DEFAULT release end @@ -291,12 +291,12 @@ Route124_DivingTreasureHuntersHouse_EventScript_270F61:: @ 8270F61 end Route124_DivingTreasureHuntersHouse_EventScript_270F63:: @ 8270F63 - msgbox Route124_DivingTreasureHuntersHouse_Text_271217, 3 + msgbox Route124_DivingTreasureHuntersHouse_Text_271217, MSGBOX_SIGN end Route124_DivingTreasureHuntersHouse_Text_270F6C: @ 8270F6C - .string "I’m the DIVING TREASURE HUNTER!\p" - .string "I’m the awesome dude who makes\n" + .string "I'm the DIVING TREASURE HUNTER!\p" + .string "I'm the awesome dude who makes\n" .string "deep-sea dives to gather treasures\l" .string "resting at the bottom.$" @@ -305,37 +305,37 @@ Route124_DivingTreasureHuntersHouse_Text_270FE5: @ 8270FE5 .string "tools made in ancient times?$" Route124_DivingTreasureHuntersHouse_Text_271027: @ 8271027 - .string "You haven’t got any treasures\n" + .string "You haven't got any treasures\n" .string "for me…\p" .string "If you see any SHARDS, like the RED\n" - .string "SHARD, you’ve got to trade it with me!$" + .string "SHARD, you've got to trade it with me!$" Route124_DivingTreasureHuntersHouse_Text_271098: @ 8271098 .string "Oh, hey! That…\n" - .string "That’s a SHARD! I’m looking for those!\p" - .string "Oh, man, you’ve got to trade that\n" - .string "with me! I’ll give you something good!$" + .string "That's a SHARD! I'm looking for those!\p" + .string "Oh, man, you've got to trade that\n" + .string "with me! I'll give you something good!$" Route124_DivingTreasureHuntersHouse_Text_271117: @ 8271117 .string "What do you want to trade?$" Route124_DivingTreasureHuntersHouse_Text_271132: @ 8271132 - .string "You’ll trade your {STR_VAR_1} for\n" + .string "You'll trade your {STR_VAR_1} for\n" .string "my {STR_VAR_2}, then?$" Route124_DivingTreasureHuntersHouse_Text_271158: @ 8271158 - .string "It’s a done deal!\n" + .string "It's a done deal!\n" .string "Use that wisely!$" Route124_DivingTreasureHuntersHouse_Text_27117B: @ 827117B .string "Do you want to trade something else?$" Route124_DivingTreasureHuntersHouse_Text_2711A0: @ 82711A0 - .string "Whoops, your BAG’s full.\n" + .string "Whoops, your BAG's full.\n" .string "Get rid of some items, friend!$" Route124_DivingTreasureHuntersHouse_Text_2711D8: @ 82711D8 - .string "No? That’s a downer.\n" + .string "No? That's a downer.\n" .string "Well, if you change your mind, come back.$" Route124_DivingTreasureHuntersHouse_Text_271217: @ 8271217 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2dda3fb2d..528eda704 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -27,67 +27,64 @@ Route125_MapScript2_1F679A: @ 81F679A .2byte 0 Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, 6 + trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A + msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, 6 + trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 + msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, 6 + trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D + msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE end Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, 6 + trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 + msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, 4 + msgbox Route125_Text_2A1755, MSGBOX_DEFAULT release end Route125_EventScript_1F682C:: @ 81F682C special sub_80B4808 waitmovement 0 - msgbox Route125_Text_2A17CF, 4 - setvar VAR_0x8004, 492 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 492 - callstd 8 + msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT + register_matchcall TRAINER_ERNEST_1 release end Route125_EventScript_1F684B:: @ 81F684B - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, 6 + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851 + msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6862:: @ 81F6862 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, 6 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 + msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE end Route125_EventScript_1F687D:: @ 81F687D - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, 6 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 + msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE end Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, 6 + trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E + msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE end Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, 6 + trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD + msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 3ea9ba786..0be11144a 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -8,62 +8,59 @@ Route126_MapScript1_1F68CC: @ 81F68CC end Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, 6 + trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 + msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE end Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, 6 + trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 + msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, 6 + trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 + msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE end Route126_EventScript_1F691B:: @ 81F691B - trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, 6 + trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 + msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, 6 + trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 + msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, 6 + trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 + msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, 6 + trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 + msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE end Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 + trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, 4 + msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT release end Route126_EventScript_1F69A3:: @ 81F69A3 special sub_80B4808 waitmovement 0 - msgbox Route126_Text_2A1F5A, 4 - setvar VAR_0x8004, 377 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 377 - callstd 8 + msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT + register_matchcall TRAINER_PABLO_1 release end Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, 6 + trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8 + msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 12e5bf127..f9c3290b9 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -27,62 +27,59 @@ Route127_MapScript2_1F6A2B: @ 81F6A2B .2byte 0 Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294 - msgbox Route127_Text_2A22A1, 6 + trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 + msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315 - msgbox Route127_Text_2A232C, 6 + trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 + msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1 - msgbox Route127_Text_2A240C, 6 + trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 + msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483 - msgbox Route127_Text_2A2494, 6 + trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 + msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B - msgbox Route127_Text_2A2538, 6 + trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B + msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1 - msgbox Route127_Text_2A25D2, 6 + trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 + msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC - msgbox Route127_Text_2A2832, 6 + trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC + msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE end Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 + trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 - msgbox Route127_Text_2A26AC, 4 + msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT release end Route127_EventScript_1F6B02:: @ 81F6B02 special sub_80B4808 waitmovement 0 - msgbox Route127_Text_2A26EE, 4 - setvar VAR_0x8004, 672 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 672 - callstd 8 + msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT + register_matchcall TRAINER_KOJI_1 release end Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B - msgbox Route127_Text_2A278E, 6 + trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B + msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 8e2742ff5..2443051f5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -17,29 +17,29 @@ Route128_EventScript_1F6B57:: @ 81F6B57 delay 20 applymovement 4, Route128_Movement_1F6C89 waitmovement 0 - msgbox Route128_Text_1F6DF5, 4 + msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C91 waitmovement 0 - msgbox Route128_Text_1F6E48, 4 + msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CAD waitmovement 0 applymovement 4, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6E5A, 4 + msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT closemessage applymovement 5, Route128_Movement_1F6CBB waitmovement 0 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F6F1E, 4 + msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT closemessage applymovement 4, Route128_Movement_1F6C96 applymovement 255, Route128_Movement_2725A4 applymovement 5, Route128_Movement_1F6CA8 waitmovement 0 - msgbox Route128_Text_1F704F, 4 + msgbox Route128_Text_1F704F, MSGBOX_DEFAULT closemessage delay 40 applymovement 5, Route128_Movement_1F6CB0 @@ -56,15 +56,15 @@ Route128_EventScript_1F6B57:: @ 81F6B57 waitmovement 0 applymovement 255, Route128_Movement_2725A8 waitmovement 0 - msgbox Route128_Text_1F70C9, 4 + msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_1F6C85 applymovement 255, Route128_Movement_2725A6 waitmovement 0 - msgbox Route128_Text_1F70EA, 4 + msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT applymovement 3, Route128_Movement_2725AA waitmovement 0 - msgbox Route128_Text_1F721B, 4 + msgbox Route128_Text_1F721B, MSGBOX_DEFAULT closemessage applymovement 3, Route128_Movement_2725AA waitmovement 0 @@ -176,78 +176,72 @@ Route128_Movement_1F6CBB: @ 81F6CBB step_end Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle 2, TRAINER_ISAIAH_1, 0, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, 4 + msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT release end Route128_EventScript_1F6CEA:: @ 81F6CEA special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2916, 4 - setvar VAR_0x8004, 376 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 376 - callstd 8 + msgbox Route128_Text_2A2916, MSGBOX_DEFAULT + register_matchcall TRAINER_ISAIAH_1 release end Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, 6 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8 + msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle 2, TRAINER_KATELYN_1, 0, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, 4 + msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT release end Route128_EventScript_1F6D4C:: @ 81F6D4C special sub_80B4808 waitmovement 0 - msgbox Route128_Text_2A2AF9, 4 - setvar VAR_0x8004, 386 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 386 - callstd 8 + msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT + register_matchcall TRAINER_KATELYN_1 release end Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, 6 + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB + msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, 6 + trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 + msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, 6 + trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE + msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, 6 + trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 + msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle 0, TRAINER_HARRISON, 0, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, 6 + trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 + msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE end Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle 0, TRAINER_CARLEE, 0, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, 6 + trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA + msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE end Route128_Text_1F6DF5: @ 81F6DF5 @@ -269,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A .string "completely out of control!$" Route128_Text_1F6F1E: @ 81F6F1E - .string "MAXIE: {PLAYER}, don’t say anything.\p" + .string "MAXIE: {PLAYER}, don't say anything.\p" .string "I know that I have no right to be\n" .string "critical of ARCHIE…\p" .string "But the way things are now, I doubt\n" @@ -284,7 +278,7 @@ Route128_Text_1F704F: @ 81F704F .string "MAXIE: This defies belief…\p" .string "Those super-ancient POKéMON…\p" .string "Their power is unbelievable.\n" - .string "They’ve upset the balance of nature…$" + .string "They've upset the balance of nature…$" Route128_Text_1F70C9: @ 81F70C9 .string "STEVEN: {PLAYER}{KUN}!\n" @@ -294,18 +288,18 @@ Route128_Text_1F70EA: @ 81F70EA .string "This is terrible…\p" .string "After the scorching heat wave ended,\n" .string "this deluge began.\p" - .string "If this doesn’t stop, all of HOENN…\n" + .string "If this doesn't stop, all of HOENN…\n" .string "No, the whole world will drown.\p" .string "This huge rain cloud is spreading\n" .string "from above SOOTOPOLIS…\p" .string "What in the world is taking place there?\p" - .string "There’s no point arguing here…\n" + .string "There's no point arguing here…\n" .string "SOOTOPOLIS might provide answers…$" Route128_Text_1F721B: @ 81F721B .string "{PLAYER}{KUN}…\n" - .string "I don’t know what you intend to do,\l" - .string "but don’t do anything reckless.\p" + .string "I don't know what you intend to do,\l" + .string "but don't do anything reckless.\p" .string "Okay.\n" - .string "I’m going to SOOTOPOLIS.$" + .string "I'm going to SOOTOPOLIS.$" diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 170d87e56..b58e9ddd4 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2 .2byte 0 Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D - msgbox Route129_Text_2A2FB9, 6 + trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D + msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 - msgbox Route129_Text_2A3048, 6 + trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 + msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE end Route129_EventScript_1F731A:: @ 81F731A - trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 - msgbox Route129_Text_2A3114, 6 + trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 + msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D - msgbox Route129_Text_2A31A6, 6 + trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D + msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE end Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 - msgbox Route129_Text_2A3252, 6 + trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 + msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 2d860050b..6698837d2 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -36,17 +36,17 @@ Route130_EventScript_1F73B5:: @ 81F73B5 return Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, 6 + trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 + msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, 6 + trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC + msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE end Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, 6 + trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D + msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 566cbef66..618d17fdb 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -18,42 +18,42 @@ Route131_EventScript_1F741F:: @ 81F741F return Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_2A34C8, Route131_Text_2A350D - msgbox Route131_Text_2A353D, 6 + trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D + msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_2A35C6, Route131_Text_2A3626 - msgbox Route131_Text_2A362D, 6 + trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 + msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_2A367B, Route131_Text_2A36AB - msgbox Route131_Text_2A36D6, 6 + trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB + msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE end Route131_EventScript_1F746E:: @ 81F746E - trainerbattle 0, TRAINER_KARA, 0, Route131_Text_2A3751, Route131_Text_2A378A - msgbox Route131_Text_2A379F, 6 + trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A + msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE end Route131_EventScript_1F7485:: @ 81F7485 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 - msgbox Route131_Text_2A3855, 6 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 + msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74A0:: @ 81F74A0 - trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD - msgbox Route131_Text_2A3960, 6 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD + msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle 0, TRAINER_TALIA, 0, Route131_Text_2A39FE, Route131_Text_2A3A38 - msgbox Route131_Text_2A3A48, 6 + trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 + msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE end Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle 0, TRAINER_KEVIN, 0, Route131_Text_2A3AA0, Route131_Text_2A3AFC - msgbox Route131_Text_2A3B02, 6 + trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC + msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index a4ae6f716..aed4d0673 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,42 +2,42 @@ Route132_MapScripts:: @ 81F74E9 .byte 0 Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC - msgbox Route132_Text_2A3BC0, 6 + trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC + msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 - msgbox Route132_Text_2A3C49, 6 + trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 + msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD - msgbox Route132_Text_2A3CC5, 6 + trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD + msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F752F:: @ 81F752F - trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C - msgbox Route132_Text_2A3D8B, 6 + trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C + msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 - msgbox Route132_Text_2A3FE5, 6 + trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE end Route132_EventScript_1F755D:: @ 81F755D - trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E - msgbox Route132_Text_2A40A4, 6 + trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E + msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE end Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD - msgbox Route132_Text_2A3F03, 6 + trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD + msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE end Route132_EventScript_1F758B:: @ 81F758B - trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C - msgbox Route132_Text_2A3E4E, 6 + trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C + msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index dc15a5d40..a91eeead3 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,37 +2,37 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, 6 + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F + msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, 6 + trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 + msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, 6 + trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 + msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, 6 + trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 + msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE end Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, 6 + trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C + msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE end Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, 6 + trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A + msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE end Route133_EventScript_1F762D:: @ 81F762D - trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, 6 + trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 + msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index bdec88c42..f6f4feee3 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,47 +7,47 @@ Route134_MapScript1_1F764A: @ 81F764A end Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle 0, TRAINER_JACK, 0, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, 6 + trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB + msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE end Route134_EventScript_1F766A:: @ 81F766A - trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, 6 + trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 + msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, 6 + trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE + msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE end Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle 0, TRAINER_AARON, 0, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, 6 + trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 + msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, 6 + trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 + msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle 0, TRAINER_HUDSON, 0, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, 6 + trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 + msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle 0, TRAINER_REYNA, 0, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, 6 + trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 + msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE end Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle 0, TRAINER_MARLEY, 0, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, 6 + trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B + msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE end Route134_EventScript_1F770B:: @ 81F770B - trainerbattle 0, TRAINER_KELVIN, 0, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, 6 + trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B + msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index e79c8ef45..147c51177 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -50,7 +50,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 waitmovement 0 applymovement 15, RustboroCity_Movement_1E084E waitmovement 0 - msgbox RustboroCity_Text_1E22A5, 4 + msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT closemessage setflag FLAG_HAS_MATCH_CALL applymovement 15, RustboroCity_Movement_2725A4 @@ -65,13 +65,13 @@ RustboroCity_EventScript_1E0715:: @ 81E0715 delay 20 applymovement 15, RustboroCity_Movement_2725AA waitmovement 0 - msgbox RustboroCity_Text_1E2331, 4 + msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT closemessage delay 20 goto RustboroCity_EventScript_1E07BD RustboroCity_EventScript_1E07AC:: @ 81E07AC - msgbox RustboroCity_Text_1E2449, 4 + msgbox RustboroCity_Text_1E2449, MSGBOX_DEFAULT closemessage delay 10 goto RustboroCity_EventScript_1E07BD @@ -92,7 +92,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD special sub_81C72A4 waitstate delay 20 - msgbox RustboroCity_Text_1E2464, 4 + msgbox RustboroCity_Text_1E2464, MSGBOX_DEFAULT closemessage applymovement 15, RustboroCity_Movement_1E085D waitmovement 0 @@ -136,24 +136,24 @@ RustboroCity_EventScript_1E085F:: @ 81E085F faceplayer checkflag FLAG_0x08E goto_eq RustboroCity_EventScript_1E0874 - msgbox RustboroCity_Text_1E123F, 4 + msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E0874:: @ 81E0874 - msgbox RustboroCity_Text_1E12AC, 4 + msgbox RustboroCity_Text_1E12AC, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E087E:: @ 81E087E lock faceplayer - msgbox RustboroCity_Text_1E1407, 4 + msgbox RustboroCity_Text_1E1407, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E088A:: @ 81E088A - msgbox RustboroCity_Text_1E1480, 2 + msgbox RustboroCity_Text_1E1480, MSGBOX_NPC end RustboroCity_EventScript_1E0893:: @ 81E0893 @@ -161,12 +161,12 @@ RustboroCity_EventScript_1E0893:: @ 81E0893 faceplayer checkflag FLAG_BADGE01_GET goto_eq RustboroCity_EventScript_1E08A8 - msgbox RustboroCity_Text_1E130D, 4 + msgbox RustboroCity_Text_1E130D, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08A8:: @ 81E08A8 - msgbox RustboroCity_Text_1E139E, 4 + msgbox RustboroCity_Text_1E139E, MSGBOX_DEFAULT release end @@ -175,55 +175,55 @@ RustboroCity_EventScript_1E08B2:: @ 81E08B2 faceplayer checkflag FLAG_0x0BC goto_eq RustboroCity_EventScript_1E08C7 - msgbox RustboroCity_Text_1E1520, 4 + msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08C7:: @ 81E08C7 - msgbox RustboroCity_Text_1E1589, 4 + msgbox RustboroCity_Text_1E1589, MSGBOX_DEFAULT release end RustboroCity_EventScript_1E08D1:: @ 81E08D1 - msgbox RustboroCity_Text_1E1633, 2 + msgbox RustboroCity_Text_1E1633, MSGBOX_NPC end RustboroCity_EventScript_1E08DA:: @ 81E08DA - msgbox RustboroCity_Text_1E1695, 3 + msgbox RustboroCity_Text_1E1695, MSGBOX_SIGN end RustboroCity_EventScript_1E08E3:: @ 81E08E3 - msgbox RustboroCity_Text_1E20A6, 3 + msgbox RustboroCity_Text_1E20A6, MSGBOX_SIGN end RustboroCity_EventScript_1E08EC:: @ 81E08EC - msgbox RustboroCity_Text_1E2128, 3 + msgbox RustboroCity_Text_1E2128, MSGBOX_SIGN end RustboroCity_EventScript_1E08F5:: @ 81E08F5 - msgbox RustboroCity_Text_1E2167, 3 + msgbox RustboroCity_Text_1E2167, MSGBOX_SIGN end RustboroCity_EventScript_1E08FE:: @ 81E08FE - msgbox RustboroCity_Text_1E21B3, 3 + msgbox RustboroCity_Text_1E21B3, MSGBOX_SIGN end RustboroCity_EventScript_1E0907:: @ 81E0907 - msgbox RustboroCity_Text_1E220B, 3 + msgbox RustboroCity_Text_1E220B, MSGBOX_SIGN end RustboroCity_EventScript_1E0910:: @ 81E0910 - msgbox RustboroCity_Text_1E2253, 3 + msgbox RustboroCity_Text_1E2253, MSGBOX_SIGN end RustboroCity_EventScript_1E0919:: @ 81E0919 - msgbox RustboroCity_Text_1E2296, 3 + msgbox RustboroCity_Text_1E2296, MSGBOX_SIGN end RustboroCity_EventScript_1E0922:: @ 81E0922 lock faceplayer - msgbox RustboroCity_Text_1E16F4, 4 + msgbox RustboroCity_Text_1E16F4, MSGBOX_DEFAULT applymovement 7, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -232,7 +232,7 @@ RustboroCity_EventScript_1E0922:: @ 81E0922 RustboroCity_EventScript_1E0938:: @ 81E0938 lock faceplayer - msgbox RustboroCity_Text_1E174B, 4 + msgbox RustboroCity_Text_1E174B, MSGBOX_DEFAULT applymovement 8, RustboroCity_Movement_2725A2 waitmovement 0 release @@ -241,7 +241,7 @@ RustboroCity_EventScript_1E0938:: @ 81E0938 RustboroCity_EventScript_1E094E:: @ 81E094E lock faceplayer - msgbox RustboroCity_Text_1E1789, 4 + msgbox RustboroCity_Text_1E1789, MSGBOX_DEFAULT release end @@ -286,7 +286,7 @@ RustboroCity_EventScript_1E09B6:: @ 81E09B6 end RustboroCity_EventScript_1E09CD:: @ 81E09CD - msgbox RustboroCity_Text_1E17FE, 4 + msgbox RustboroCity_Text_1E17FE, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 0 addobject 10 @@ -296,7 +296,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD removeobject 10 applymovement 9, RustboroCity_Movement_1E0AB1 waitmovement 0 - msgbox RustboroCity_Text_1E1817, 4 + msgbox RustboroCity_Text_1E1817, MSGBOX_DEFAULT closemessage applymovement 9, RustboroCity_Movement_1E0AB9 waitmovement 0 @@ -317,11 +317,11 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD end RustboroCity_EventScript_1E0A3B:: @ 81E0A3B - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A44:: @ 81E0A44 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0A4D:: @ 81E0A4D @@ -453,7 +453,7 @@ RustboroCity_EventScript_1E0ADD:: @ 81E0ADD faceplayer checkflag FLAG_0x08F goto_eq RustboroCity_EventScript_1E0AF2 - msgbox RustboroCity_Text_1E1904, 4 + msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -499,7 +499,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E setflag FLAG_0x09F setvar VAR_0x405A, 3 moveobjectoffscreen 9 - msgbox RustboroCity_Text_1E183E, 4 + msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT releaseall end @@ -592,11 +592,11 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B call_if 1, RustboroCity_EventScript_1E0D60 compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_1E0D96 - msgbox RustboroCity_Text_1E194D, 4 + msgbox RustboroCity_Text_1E194D, MSGBOX_DEFAULT giveitem_std ITEM_GREAT_BALL compare VAR_RESULT, 0 call_if 1, RustboroCity_EventScript_1E0CD3 - msgbox RustboroCity_Text_1E1A21, 4 + msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage setflag FLAG_0x090 setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 @@ -608,7 +608,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B end RustboroCity_EventScript_1E0CD3:: @ 81E0CD3 - msgbox RustboroCity_Text_1E19E5, 4 + msgbox RustboroCity_Text_1E19E5, MSGBOX_DEFAULT return RustboroCity_EventScript_1E0CDC:: @ 81E0CDC @@ -838,11 +838,11 @@ RustboroCity_EventScript_1E100B:: @ 81E100B checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1070 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1A49, 4 + msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1ADB, 4 + msgbox RustboroCity_Text_1E1ADB, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -850,25 +850,25 @@ RustboroCity_EventScript_1E100B:: @ 81E100B setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 - msgbox RustboroCity_Text_1E1AFA, 5 + msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1070:: @ 81E1070 setvar VAR_0x8008, 1 - msgbox RustboroCity_Text_1E1C48, 5 + msgbox RustboroCity_Text_1E1C48, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1092 - msgbox RustboroCity_Text_1E1BD3, 4 + msgbox RustboroCity_Text_1E1BD3, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1092:: @ 81E1092 - msgbox RustboroCity_Text_1E1C84, 4 + msgbox RustboroCity_Text_1E1C84, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E10DB case 1, RustboroCity_EventScript_1E10EE @@ -876,7 +876,7 @@ RustboroCity_EventScript_1E1092:: @ 81E1092 end RustboroCity_EventScript_1E10C1:: @ 81E10C1 - msgbox RustboroCity_Text_1E1CE7, 4 + msgbox RustboroCity_Text_1E1CE7, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall @@ -888,19 +888,19 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6 return RustboroCity_EventScript_1E10DB:: @ 81E10DB - trainerbattle 3, TRAINER_MAY_14, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E10EE:: @ 81E10EE - trainerbattle 3, TRAINER_MAY_15, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E1101:: @ 81E1101 - trainerbattle 3, TRAINER_MAY_10, 0, RustboroCity_Text_1E1CC1 + trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E10C1 end @@ -911,35 +911,35 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 checkflag FLAG_0x120 goto_eq RustboroCity_EventScript_1E1174 setflag FLAG_0x120 - msgbox RustboroCity_Text_1E1D7D, 4 + msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Text_1E1E11, 4 + msgbox RustboroCity_Text_1E1E11, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0FD setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 - msgbox RustboroCity_Text_1E1E34, 5 + msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT call RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E1174:: @ 81E1174 - msgbox RustboroCity_Text_1E1F76, 5 + msgbox RustboroCity_Text_1E1F76, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq RustboroCity_EventScript_1E1191 - msgbox RustboroCity_Text_1E1F2F, 4 + msgbox RustboroCity_Text_1E1F2F, MSGBOX_DEFAULT releaseall end RustboroCity_EventScript_1E1191:: @ 81E1191 - msgbox RustboroCity_Text_1E1FA9, 4 + msgbox RustboroCity_Text_1E1FA9, MSGBOX_DEFAULT switch VAR_STARTER_MON case 0, RustboroCity_EventScript_1E11D5 case 1, RustboroCity_EventScript_1E11E8 @@ -947,26 +947,26 @@ RustboroCity_EventScript_1E1191:: @ 81E1191 end RustboroCity_EventScript_1E11C0:: @ 81E11C0 - msgbox RustboroCity_Text_1E2002, 4 + msgbox RustboroCity_Text_1E2002, MSGBOX_DEFAULT compare VAR_0x8008, 0 call_if 1, RustboroCity_EventScript_1E10D6 releaseall end RustboroCity_EventScript_1E11D5:: @ 81E11D5 - trainerbattle 3, TRAINER_BRENDAN_10, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11E8:: @ 81E11E8 - trainerbattle 3, TRAINER_BRENDAN_12, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11FB:: @ 81E11FB - trainerbattle 3, TRAINER_BRENDAN_11, 0, RustboroCity_Text_1E1FE9 + trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 setflag FLAG_0x0D3 goto RustboroCity_EventScript_1E11C0 end @@ -1028,7 +1028,7 @@ RustboroCity_Movement_1E1230: @ 81E1230 step_end RustboroCity_EventScript_1E1236:: @ 81E1236 - msgbox RustboroCity_Text_1E249D, 2 + msgbox RustboroCity_Text_1E249D, MSGBOX_NPC end RustboroCity_Text_1E123F: @ 81E123F @@ -1050,21 +1050,21 @@ RustboroCity_Text_1E130D: @ 81E130D .string "realize what is required of them.$" RustboroCity_Text_1E139E: @ 81E139E - .string "Hey, that’s RUSTBORO’s GYM BADGE!\p" + .string "Hey, that's RUSTBORO's GYM BADGE!\p" .string "Out of all the POKéMON GYM BADGES,\n" - .string "RUSTBORO’s is the coolest, I’d say.$" + .string "RUSTBORO's is the coolest, I'd say.$" RustboroCity_Text_1E1407: @ 81E1407 .string "Oh? Who might you be?\n" - .string "You’re a new face around these parts.\p" + .string "You're a new face around these parts.\p" .string "Have you just transferred into the\n" - .string "POKéMON TRAINER’S SCHOOL?$" + .string "POKéMON TRAINER'S SCHOOL?$" RustboroCity_Text_1E1480: @ 81E1480 .string "I challenged the GYM LEADER, but…\p" - .string "It’s not going to be easy winning with\n" + .string "It's not going to be easy winning with\n" .string "my FIRE-type POKéMON…\p" - .string "FIRE-type POKéMON don’t match up\n" + .string "FIRE-type POKéMON don't match up\n" .string "well against ROCK-type POKéMON…$" RustboroCity_Text_1E1520: @ 81E1520 @@ -1083,11 +1083,11 @@ RustboroCity_Text_1E1589: @ 81E1589 RustboroCity_Text_1E1633: @ 81E1633 .string "Wow, you have POKéMON with you, too.\p" - .string "When I get bigger, I’m going to go\n" + .string "When I get bigger, I'm going to go\n" .string "places with POKéMON, too.$" RustboroCity_Text_1E1695: @ 81E1695 - .string "POKéMON TRAINER’S SCHOOL!\p" + .string "POKéMON TRAINER'S SCHOOL!\p" .string "If I go to this school, will I be able\n" .string "to catch rare POKéMON easily?$" @@ -1103,7 +1103,7 @@ RustboroCity_Text_1E174B: @ 81E174B RustboroCity_Text_1E1789: @ 81E1789 .string "A POKéMON you get in a trade from\n" .string "someone grows fast.\p" - .string "But if you don’t have certain GYM\n" + .string "But if you don't have certain GYM\n" .string "BADGES, it may not obey you…$" RustboroCity_Text_1E17FE: @ 81E17FE @@ -1112,16 +1112,16 @@ RustboroCity_Text_1E17FE: @ 81E17FE RustboroCity_Text_1E1817: @ 81E1817 .string "Wait! Pleeeaaase!\p" - .string "Don’t take my GOODS!$" + .string "Don't take my GOODS!$" RustboroCity_Text_1E183E: @ 81E183E - .string "Oh, it’s you!\p" - .string "You’re that fantastic TRAINER who\n" + .string "Oh, it's you!\p" + .string "You're that fantastic TRAINER who\n" .string "helped me in PETALBURG WOODS!\p" .string "Help me! I was robbed by TEAM AQUA!\n" .string "I have to get the DEVON GOODS back!\p" - .string "If I don’t…\n" - .string "I’m going to be in serious trouble.$" + .string "If I don't…\n" + .string "I'm going to be in serious trouble.$" RustboroCity_Text_1E1904: @ 81E1904 .string "That shady character, I think he took\n" @@ -1133,12 +1133,12 @@ RustboroCity_Text_1E194D: @ 81E194D .string "You did!\n" .string "You got them back!\p" .string "You really are a great TRAINER!\p" - .string "I know! As my thanks, I’ll give you\n" + .string "I know! As my thanks, I'll give you\n" .string "another GREAT BALL!$" RustboroCity_Text_1E19E5: @ 81E19E5 - .string "You’re loaded with items.\n" - .string "I can’t give you this GREAT BALL.$" + .string "You're loaded with items.\n" + .string "I can't give you this GREAT BALL.$" RustboroCity_Text_1E1A21: @ 81E1A21 .string "Excuse me, please!\n" @@ -1148,7 +1148,7 @@ RustboroCity_Text_1E1A49: @ 81E1A49 .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV!\p" - .string "Let’s register each other so we can\n" + .string "Let's register each other so we can\n" .string "contact one another anytime!\p" .string "… … … … … …$" @@ -1159,18 +1159,18 @@ RustboroCity_Text_1E1ADB: @ 81E1ADB RustboroCity_Text_1E1AFA: @ 81E1AFA .string "MAY: Oh, by the way, I passed\n" .string "MR. BRINEY in PETALBURG WOODS.\p" - .string "I guess he’s on his way home to his\n" + .string "I guess he's on his way home to his\n" .string "cottage by the sea.\p" - .string "How’s your POKéDEX coming along,\n" - .string "{PLAYER}{KUN}? Mine’s looking pretty decent!\p" + .string "How's your POKéDEX coming along,\n" + .string "{PLAYER}{KUN}? Mine's looking pretty decent!\p" .string "So…\n" .string "How about a little battle?$" RustboroCity_Text_1E1BD3: @ 81E1BD3 - .string "MAY: Oh, what’s the matter?\p" - .string "Haven’t you caught or raised your\n" + .string "MAY: Oh, what's the matter?\p" + .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" - .string "That’s not very good for a TRAINER!$" + .string "That's not very good for a TRAINER!$" RustboroCity_Text_1E1C48: @ 81E1C48 .string "MAY: So, what do you think?\n" @@ -1178,11 +1178,11 @@ RustboroCity_Text_1E1C48: @ 81E1C48 RustboroCity_Text_1E1C84: @ 81E1C84 .string "MAY: You just became a TRAINER,\n" - .string "{PLAYER}{KUN}. I’m not going to lose!$" + .string "{PLAYER}{KUN}. I'm not going to lose!$" RustboroCity_Text_1E1CC1: @ 81E1CC1 .string "Yikes!\n" - .string "You’re better than I expected!$" + .string "You're better than I expected!$" RustboroCity_Text_1E1CE7: @ 81E1CE7 .string "MAY: Oh, by the way, MR. BRINEY, who\n" @@ -1195,7 +1195,7 @@ RustboroCity_Text_1E1D7D: @ 81E1D7D .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "You had a MATCH CALL feature put\n" .string "on your POKéNAV! Cool!\p" - .string "Let’s register each other so we can\n" + .string "Let's register each other so we can\n" .string "get in touch anytime!\p" .string "… … … … … …$" @@ -1208,32 +1208,32 @@ RustboroCity_Text_1E1E34: @ 81E1E34 .string "by MR. BRINEY in PETALBURG WOODS.\p" .string "I bet he was on his way home to his\n" .string "cottage by the sea.\p" - .string "{PLAYER}, how’s your POKéDEX?\n" + .string "{PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?\p" .string "Mine rules.\p" .string "Want to have a battle to test how\n" - .string "far you’ve progressed?$" + .string "far you've progressed?$" RustboroCity_Text_1E1F2F: @ 81E1F2F - .string "BRENDAN: What’s the matter? Don’t have\n" + .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" RustboroCity_Text_1E1F76: @ 81E1F76 - .string "BRENDAN: What’s up?\n" + .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" RustboroCity_Text_1E1FA9: @ 81E1FA9 .string "BRENDAN: I know you just became\n" - .string "a TRAINER, but I won’t go easy!$" + .string "a TRAINER, but I won't go easy!$" RustboroCity_Text_1E1FE9: @ 81E1FE9 .string "Hmm…\n" - .string "You’re pretty good.$" + .string "You're pretty good.$" RustboroCity_Text_1E2002: @ 81E2002 .string "BRENDAN: By the way, you know\n" .string "MR. BRINEY? The guy I just passed?\p" - .string "I bet you didn’t know this, since you\n" + .string "I bet you didn't know this, since you\n" .string "just moved here, {PLAYER}, but\l" .string "MR. BRINEY was once a great sailor.$" @@ -1241,7 +1241,7 @@ RustboroCity_Text_1E20A6: @ 81E20A6 .string "“Timesaving tunnel nearing\n" .string "completion!”\p" .string "…Is what it says on the sign, but\n" - .string "there’s also a big “X” splashed\l" + .string "there's also a big “X” splashed\l" .string "across it in red paint…$" RustboroCity_Text_1E2128: @ 81E2128 @@ -1265,15 +1265,15 @@ RustboroCity_Text_1E220B: @ 81E220B .string "nature and science.”$" RustboroCity_Text_1E2253: @ 81E2253 - .string "POKéMON TRAINER’S SCHOOL\p" - .string "“We’ll teach you anything about\n" + .string "POKéMON TRAINER'S SCHOOL\p" + .string "“We'll teach you anything about\n" .string "POKéMON!”$" RustboroCity_Text_1E2296: @ 81E2296 - .string "CUTTER’S HOUSE$" + .string "CUTTER'S HOUSE$" RustboroCity_Text_1E22A5: @ 81E22A5 - .string "I’ve been developing an added feature\n" + .string "I've been developing an added feature\n" .string "for the POKéNAV…\p" .string "And it turned out great!\p" .string "{PLAYER}, may I see that POKéNAV?\n" @@ -1295,16 +1295,16 @@ RustboroCity_Text_1E2449: @ 81E2449 .string "Please select the POKéNAV.$" RustboroCity_Text_1E2464: @ 81E2464 - .string "Okay, I’d better get back to work.\n" + .string "Okay, I'd better get back to work.\n" .string "Please take care, {PLAYER}!$" RustboroCity_Text_1E249D: @ 81E249D .string "Did you know this?\p" .string "You can have a 2-on-2 battle even\n" - .string "if you’re not with another TRAINER.\p" + .string "if you're not with another TRAINER.\p" .string "If you catch the eyes of two TRAINERS\n" .string "when you have two or more POKéMON,\l" - .string "they’ll both challenge you.\p" - .string "Don’t you think it’d be cool if you\n" + .string "they'll both challenge you.\p" + .string "Don't you think it'd be cool if you\n" .string "could beat two TRAINERS by yourself?$" diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index e5c7527f7..1ed908952 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -6,30 +6,30 @@ RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 faceplayer checkflag FLAG_0x089 goto_eq RustboroCity_CuttersHouse_EventScript_215C00 - msgbox RustboroCity_CuttersHouse_Text_215C13, 4 + msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 setflag FLAG_0x089 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C00:: @ 8215C00 - msgbox RustboroCity_CuttersHouse_Text_215D33, 4 + msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end RustboroCity_CuttersHouse_EventScript_215C0A:: @ 8215C0A - msgbox RustboroCity_CuttersHouse_Text_215E39, 2 + msgbox RustboroCity_CuttersHouse_Text_215E39, MSGBOX_NPC end RustboroCity_CuttersHouse_Text_215C13: @ 8215C13 .string "That determined expression…\n" .string "That limber way you move…\l" .string "And your well-trained POKéMON…\p" - .string "You’re obviously a skilled TRAINER!\p" - .string "No, wait, don’t say a word.\n" + .string "You're obviously a skilled TRAINER!\p" + .string "No, wait, don't say a word.\n" .string "I can tell just by looking at you.\p" - .string "I’m sure that you can put this\n" + .string "I'm sure that you can put this\n" .string "HIDDEN MACHINE to good use.\p" .string "No need to be modest or shy.\n" .string "Go on, take it!$" @@ -39,7 +39,7 @@ RustboroCity_CuttersHouse_Text_215D33: @ 8215D33 .string "short, is CUT.\p" .string "An HM move is one that can be used\n" .string "by POKéMON outside of battle.\p" - .string "Any POKéMON that’s learned CUT can\n" + .string "Any POKéMON that's learned CUT can\n" .string "chop down thin trees if the TRAINER\l" .string "has earned the STONE BADGE.\p" .string "And, unlike a TM, an HM can be used\n" diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 97d7dcf78..e8314ba04 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -19,17 +19,17 @@ RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 goto_eq RustboroCity_DevonCorp_1F_EventScript_211289 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_21127F - msgbox RustboroCity_DevonCorp_1F_Text_2113D1, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_21127F:: @ 821127F - msgbox RustboroCity_DevonCorp_1F_Text_211446, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211446, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 - msgbox RustboroCity_DevonCorp_1F_Text_2114DE, 4 + msgbox RustboroCity_DevonCorp_1F_Text_2114DE, MSGBOX_DEFAULT release end @@ -42,17 +42,17 @@ RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112C4 - msgbox RustboroCity_DevonCorp_1F_Text_21151B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112BA:: @ 82112BA - msgbox RustboroCity_DevonCorp_1F_Text_211585, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211585, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 - msgbox RustboroCity_DevonCorp_1F_Text_211558, 4 + msgbox RustboroCity_DevonCorp_1F_Text_211558, MSGBOX_DEFAULT release end @@ -65,32 +65,32 @@ RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF checkflag FLAG_0x08E goto_eq RustboroCity_DevonCorp_1F_EventScript_2112FF - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112F5:: @ 82112F5 - msgbox RustboroCity_DevonCorp_1F_Text_21131B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_2112FF:: @ 82112FF - msgbox RustboroCity_DevonCorp_1F_Text_21138B, 4 + msgbox RustboroCity_DevonCorp_1F_Text_21138B, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_1F_EventScript_211309:: @ 8211309 - msgbox RustboroCity_DevonCorp_1F_Text_2115AC, 3 + msgbox RustboroCity_DevonCorp_1F_Text_2115AC, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_EventScript_211312:: @ 8211312 - msgbox RustboroCity_DevonCorp_1F_Text_211722, 3 + msgbox RustboroCity_DevonCorp_1F_Text_211722, MSGBOX_SIGN end RustboroCity_DevonCorp_1F_Text_21131B: @ 821131B .string "Hello and welcome to the DEVON\n" .string "CORPORATION.\p" - .string "We’re proud producers of items and\n" + .string "We're proud producers of items and\n" .string "medicine that enhance your life.$" RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B @@ -99,37 +99,37 @@ RustboroCity_DevonCorp_1F_Text_21138B: @ 821138B RustboroCity_DevonCorp_1F_Text_2113D1: @ 82113D1 .string "Hey, those RUNNING SHOES!\n" - .string "They’re one of our products!\p" + .string "They're one of our products!\p" .string "It makes me happy when I see someone\n" .string "using something we made.$" RustboroCity_DevonCorp_1F_Text_211446: @ 8211446 .string "That stolen parcel…\p" - .string "Well, sure it’s important, but it’s not\n" + .string "Well, sure it's important, but it's not\n" .string "anything that anyone can use.\p" .string "In my estimation, that robber must not\n" .string "have been very bright.$" RustboroCity_DevonCorp_1F_Text_2114DE: @ 82114DE - .string "It sounds like they’ve recovered\n" + .string "It sounds like they've recovered\n" .string "the ripped-off DEVON GOODS.$" RustboroCity_DevonCorp_1F_Text_21151B: @ 821151B - .string "I’m sorry, only authorized people\n" + .string "I'm sorry, only authorized people\n" .string "are allowed to enter here.$" RustboroCity_DevonCorp_1F_Text_211558: @ 8211558 - .string "It’s beyond stupid.\n" + .string "It's beyond stupid.\n" .string "How could we get robbed?$" RustboroCity_DevonCorp_1F_Text_211585: @ 8211585 .string "Hi, there!\n" - .string "You’re always welcome here!$" + .string "You're always welcome here!$" RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC .string "Samples of rocks and metal are\n" .string "displayed in the glass case.\p" - .string "There’s a panel with some writing\n" + .string "There's a panel with some writing\n" .string "on it…\p" .string "“DEVON CORPORATION got its start as\n" .string "a producer of stones from quarries.\p" @@ -143,7 +143,7 @@ RustboroCity_DevonCorp_1F_Text_2115AC: @ 82115AC RustboroCity_DevonCorp_1F_Text_211722: @ 8211722 .string "Prototypes and test products fill\n" .string "the glass display case.\p" - .string "There’s a panel with a description…\p" + .string "There's a panel with a description…\p" .string "“In addition to industrial products,\n" .string "DEVON now markets sundries and\l" .string "pharmaceuticals for better lifestyles.\p" diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 88f0c2e73..fc8dd5f79 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -16,7 +16,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211BFB, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT release end @@ -27,12 +27,12 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x11F goto_eq RustboroCity_DevonCorp_2F_EventScript_2118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C50, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6 - msgbox RustboroCity_DevonCorp_2F_Text_211C99, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211C99, MSGBOX_DEFAULT release end @@ -43,12 +43,12 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 checkflag FLAG_0x0BC goto_eq RustboroCity_DevonCorp_2F_EventScript_2118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211D9F, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0 - msgbox RustboroCity_DevonCorp_2F_Text_211DF3, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211DF3, MSGBOX_DEFAULT release end @@ -57,7 +57,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA faceplayer compare VAR_0x40C4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 - msgbox RustboroCity_DevonCorp_2F_Text_211EE0, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT release end @@ -68,7 +68,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211A03 compare VAR_0x40C4, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119F9 - msgbox RustboroCity_DevonCorp_2F_Text_211F48, 4 + msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 goto_eq RustboroCity_DevonCorp_2F_EventScript_211933 @@ -85,7 +85,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_CLAW_FOSSIL, 1 @@ -96,7 +96,7 @@ RustboroCity_DevonCorp_2F_EventScript_211933:: @ 8211933 RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974 bufferitemname 0, ITEM_ROOT_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_ROOT_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 1 @@ -110,7 +110,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_27259A waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_211FA6, 5 + msgbox RustboroCity_DevonCorp_2F_Text_211FA6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_2119EF checkitem ITEM_ROOT_FOSSIL, 1 @@ -121,7 +121,7 @@ RustboroCity_DevonCorp_2F_EventScript_211991:: @ 8211991 RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 bufferitemname 0, ITEM_CLAW_FOSSIL - msgbox RustboroCity_DevonCorp_2F_Text_212153, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT takeitem ITEM_CLAW_FOSSIL, 1 setvar VAR_0x40C4, 1 setvar VAR_0x40C5, 2 @@ -129,12 +129,12 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2 end RustboroCity_DevonCorp_2F_EventScript_2119EF:: @ 82119EF - msgbox RustboroCity_DevonCorp_2F_Text_212046, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212046, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9 - msgbox RustboroCity_DevonCorp_2F_Text_2121A2, 4 + msgbox RustboroCity_DevonCorp_2F_Text_2121A2, MSGBOX_DEFAULT release end @@ -147,13 +147,13 @@ RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03 RustboroCity_DevonCorp_2F_EventScript_211A1A:: @ 8211A1A bufferspeciesname 1, SPECIES_LILEEP - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211A3E end RustboroCity_DevonCorp_2F_EventScript_211A2C:: @ 8211A2C bufferspeciesname 1, SPECIES_ANORITH - msgbox RustboroCity_DevonCorp_2F_Text_212251, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212251, MSGBOX_DEFAULT goto RustboroCity_DevonCorp_2F_EventScript_211AE1 end @@ -169,7 +169,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A3E:: @ 8211A3E RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AD7 call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -179,7 +179,7 @@ RustboroCity_DevonCorp_2F_EventScript_211A6E:: @ 8211A6E RustboroCity_DevonCorp_2F_EventScript_211A96:: @ 8211A96 call RustboroCity_DevonCorp_2F_EventScript_211AC4 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211AB9 call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -218,7 +218,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AE1:: @ 8211AE1 RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B7A call RustboroCity_DevonCorp_2F_EventScript_27378B @@ -228,7 +228,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B11:: @ 8211B11 RustboroCity_DevonCorp_2F_EventScript_211B39:: @ 8211B39 call RustboroCity_DevonCorp_2F_EventScript_211B67 - msgbox gUnknown_08273374, 5 + msgbox gUnknown_08273374, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_2F_EventScript_211B5C call RustboroCity_DevonCorp_2F_EventScript_273797 @@ -285,30 +285,30 @@ RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF call_if 1, RustboroCity_DevonCorp_2F_EventScript_211869 compare VAR_0x405A, 6 goto_if 4, RustboroCity_DevonCorp_2F_EventScript_211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212338, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212338, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_EventScript_211BF1:: @ 8211BF1 - msgbox RustboroCity_DevonCorp_2F_Text_212386, 4 + msgbox RustboroCity_DevonCorp_2F_Text_212386, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_2F_Text_211BFB: @ 8211BFB - .string "We’re developing a device for talking\n" + .string "We're developing a device for talking\n" .string "with POKéMON.\p" - .string "But we haven’t had much success…$" + .string "But we haven't had much success…$" RustboroCity_DevonCorp_2F_Text_211C50: @ 8211C50 - .string "I’m developing new kinds of\n" + .string "I'm developing new kinds of\n" .string "POKé BALLS…\p" - .string "But I haven’t made much headway…$" + .string "But I haven't made much headway…$" RustboroCity_DevonCorp_2F_Text_211C99: @ 8211C99 .string "We finally made new kinds of\n" .string "POKé BALLS!\p" .string "The REPEAT BALL makes it easier to\n" - .string "catch POKéMON you’ve caught before.\p" + .string "catch POKéMON you've caught before.\p" .string "The TIMER BALL gets better at catching\n" .string "POKéMON the longer a battle runs.\p" .string "Both are proudly developed by\n" @@ -322,25 +322,25 @@ RustboroCity_DevonCorp_2F_Text_211D9F: @ 8211D9F RustboroCity_DevonCorp_2F_Text_211DF3: @ 8211DF3 .string "Oh, wow!\n" - .string "That’s a POKéNAV!\p" + .string "That's a POKéNAV!\p" .string "It came about as a result of our\n" - .string "PRESIDENT’s desire to learn about\l" + .string "PRESIDENT's desire to learn about\l" .string "the feelings of POKéMON.\p" .string "Would you like me to describe its\n" .string "features in detail?\p" - .string "No, no. I think you’ll find out just by\n" + .string "No, no. I think you'll find out just by\n" .string "trying the POKéNAV out.$" RustboroCity_DevonCorp_2F_Text_211EE0: @ 8211EE0 - .string "I’m trying to develop a device that\n" + .string "I'm trying to develop a device that\n" .string "visually reproduces the dreams of\l" .string "POKéMON…\p" - .string "But it’s not going well.$" + .string "But it's not going well.$" RustboroCity_DevonCorp_2F_Text_211F48: @ 8211F48 - .string "I’ve been trying to develop a device\n" + .string "I've been trying to develop a device\n" .string "that resurrects POKéMON from fossils…\p" - .string "And, it’s working!$" + .string "And, it's working!$" RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 .string "Wait! That thing you have there…\n" @@ -352,11 +352,11 @@ RustboroCity_DevonCorp_2F_Text_211FA6: @ 8211FA6 RustboroCity_DevonCorp_2F_Text_212046: @ 8212046 .string "Oh, is that so?\p" - .string "DEVON’s technological expertise\n" + .string "DEVON's technological expertise\n" .string "is outstanding, I tell you.$" RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 - .string "Oh, now that’s a surprise!\n" + .string "Oh, now that's a surprise!\n" .string "You have not one, but two, fossils?\p" .string "Unfortunately, my machine can only\n" .string "regenerate one POKéMON at a time.\p" @@ -365,7 +365,7 @@ RustboroCity_DevonCorp_2F_Text_212092: @ 8212092 RustboroCity_DevonCorp_2F_Text_212153: @ 8212153 .string "Excellent!\n" - .string "Let’s do this right away.\p" + .string "Let's do this right away.\p" .string "{PLAYER} handed the {STR_VAR_1} to\n" .string "the DEVON RESEARCHER.$" @@ -389,19 +389,19 @@ RustboroCity_DevonCorp_2F_Text_2122CB: @ 82122CB .string "the DEVON RESEARCHER.$" RustboroCity_DevonCorp_2F_Text_2122F5: @ 82122F5 - .string "Uh-oh, you’ve got too many POKéMON.\n" + .string "Uh-oh, you've got too many POKéMON.\n" .string "You have no room for this one.$" RustboroCity_DevonCorp_2F_Text_212338: @ 8212338 - .string "I’m trying to develop a new feature\n" + .string "I'm trying to develop a new feature\n" .string "for the POKéNAV…\p" - .string "But it’s not going well.$" + .string "But it's not going well.$" RustboroCity_DevonCorp_2F_Text_212386: @ 8212386 .string "Well, now what shall I work on\n" .string "developing next?\p" .string "Our company allows us to make our\n" .string "inspirations into reality.\p" - .string "One couldn’t ask for a better\n" + .string "One couldn't ask for a better\n" .string "environment as an engineer.$" diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index e3ecb3db0..dc170677a 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -28,38 +28,38 @@ RustboroCity_DevonCorp_3F_MapScript2_212464: @ 8212464 RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E lockall - msgbox RustboroCity_DevonCorp_3F_Text_212C37, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212C37, MSGBOX_DEFAULT closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_212546 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_21254F waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212DE8, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212DE8, MSGBOX_DEFAULT closemessage playbgm MUS_TSURETEK, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_212534 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212558 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212E2F, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E2F, MSGBOX_DEFAULT closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_212543 applymovement 255, RustboroCity_DevonCorp_3F_Movement_212566 waitmovement 0 - msgbox RustboroCity_DevonCorp_3F_Text_212609, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212609, MSGBOX_DEFAULT giveitem_std ITEM_LETTER - msgbox RustboroCity_DevonCorp_3F_Text_21277C, 4 + msgbox RustboroCity_DevonCorp_3F_Text_21277C, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET setflag FLAG_0x0BC setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - msgbox RustboroCity_DevonCorp_3F_Text_212837, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage call RustboroCity_DevonCorp_3F_EventScript_272083 - msgbox RustboroCity_DevonCorp_3F_Text_2129D2, 4 + msgbox RustboroCity_DevonCorp_3F_Text_2129D2, MSGBOX_DEFAULT setflag FLAG_HIDE_ROUTE_116_TUNNELER clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN clearflag FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN @@ -154,7 +154,7 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C goto_eq RustboroCity_DevonCorp_3F_EventScript_2125CC checkflag FLAG_0x0BD goto_eq RustboroCity_DevonCorp_3F_EventScript_212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A09, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -162,12 +162,12 @@ RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C end RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 - msgbox RustboroCity_DevonCorp_3F_Text_212A29, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A29, MSGBOX_DEFAULT giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_eq RustboroCity_DevonCorp_3F_EventScript_272054 setflag FLAG_0x110 - msgbox RustboroCity_DevonCorp_3F_Text_212A9E, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -175,7 +175,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 end RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC - msgbox RustboroCity_DevonCorp_3F_Text_212B78, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212B78, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 waitmovement 0 @@ -187,54 +187,54 @@ RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 faceplayer checkflag FLAG_0x100 goto_eq RustboroCity_DevonCorp_3F_EventScript_2125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E41, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_2125F6:: @ 82125F6 - msgbox RustboroCity_DevonCorp_3F_Text_212E88, 4 + msgbox RustboroCity_DevonCorp_3F_Text_212E88, MSGBOX_DEFAULT release end RustboroCity_DevonCorp_3F_EventScript_212600:: @ 8212600 - msgbox RustboroCity_DevonCorp_3F_Text_212EE9, 3 + msgbox RustboroCity_DevonCorp_3F_Text_212EE9, MSGBOX_SIGN end RustboroCity_DevonCorp_3F_Text_212609: @ 8212609 - .string "I’m MR. STONE, the PRESIDENT of\n" + .string "I'm MR. STONE, the PRESIDENT of\n" .string "the DEVON CORPORATION.\p" - .string "I’d just got word about you!\p" + .string "I'd just got word about you!\p" .string "You saved our staff not just once,\n" .string "but twice!\p" .string "I have a favor to ask of an amazing\n" .string "person like you.\p" - .string "I understand that you’re delivering\n" - .string "a package to SLATEPORT’s SHIPYARD.\p" + .string "I understand that you're delivering\n" + .string "a package to SLATEPORT's SHIPYARD.\p" .string "Well, on the way, could you stop off in\n" .string "DEWFORD TOWN?\p" - .string "I was hoping that you’d deliver a\n" + .string "I was hoping that you'd deliver a\n" .string "LETTER to STEVEN in DEWFORD.$" RustboroCity_DevonCorp_3F_Text_21277C: @ 821277C .string "MR. STONE: Now, you should know that\n" .string "I am a great PRESIDENT.\p" - .string "So, I’d never be so cheap as to ask\n" + .string "So, I'd never be so cheap as to ask\n" .string "a favor for nothing in return.\p" - .string "That’s why I want you to have this!$" + .string "That's why I want you to have this!$" RustboroCity_DevonCorp_3F_Text_212820: @ 8212820 .string "{PLAYER} received a POKéNAV.$" RustboroCity_DevonCorp_3F_Text_212837: @ 8212837 .string "MR. STONE: That device…\p" - .string "It’s a POKéMON NAVIGATOR, or POKéNAV\n" + .string "It's a POKéMON NAVIGATOR, or POKéNAV\n" .string "for short.\p" - .string "It’s an indispensable tool for any\n" + .string "It's an indispensable tool for any\n" .string "TRAINER on an adventure.\p" .string "It has a map of the HOENN region.\p" .string "You can check the locations of\n" .string "DEWFORD and SLATEPORT easily!\p" - .string "By the way, I’ve heard that sinister\n" + .string "By the way, I've heard that sinister\n" .string "criminals--MAGMA and AQUA, I believe--\l" .string "have been making trouble far and wide.\p" .string "I think it would be best if you rested\n" @@ -245,7 +245,7 @@ RustboroCity_DevonCorp_3F_Text_2129D2: @ 82129D2 .string "go with caution and care!$" RustboroCity_DevonCorp_3F_Text_212A09: @ 8212A09 - .string "MR. STONE: I’m counting on you!$" + .string "MR. STONE: I'm counting on you!$" RustboroCity_DevonCorp_3F_Text_212A29: @ 8212A29 .string "MR. STONE: You delivered my LETTER?\n" @@ -257,26 +257,26 @@ RustboroCity_DevonCorp_3F_Text_212A9E: @ 8212A9E .string "MR. STONE: A POKéMON holding that\n" .string "EXP. SHARE will be given some of the\l" .string "EXP Points from battle.\p" - .string "It will get EXP Points even if it didn’t\n" + .string "It will get EXP Points even if it didn't\n" .string "actually battle.\p" .string "I would say EXP. SHARE is quite useful\n" .string "for raising weak POKéMON.$" RustboroCity_DevonCorp_3F_Text_212B78: @ 8212B78 - .string "MR. STONE: Since my youth, I’ve immersed\n" + .string "MR. STONE: Since my youth, I've immersed\n" .string "myself in work.\p" - .string "Consequently, I’m not familiar with\n" + .string "Consequently, I'm not familiar with\n" .string "trends and that sort of thing.\p" .string "But do young people all want to be\n" .string "TRAINERS in the POKéMON LEAGUE?$" RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 - .string "This is the DEVON CORPORATION’s\n" + .string "This is the DEVON CORPORATION's\n" .string "third floor.\p" - .string "Our PRESIDENT’s OFFICE is on\n" + .string "Our PRESIDENT's OFFICE is on\n" .string "this floor.\p" - .string "Anyway, I can’t tell you how much I’m\n" - .string "grateful for what you’ve done.\p" + .string "Anyway, I can't tell you how much I'm\n" + .string "grateful for what you've done.\p" .string "Um… By the way, that parcel\n" .string "you got back for us…\p" .string "Could I get you to deliver that to\n" @@ -285,7 +285,7 @@ RustboroCity_DevonCorp_3F_Text_212C37: @ 8212C37 .string "tried to take it again.\p" .string "Uh… Hehehe, so, uh, could I count\n" .string "on you to do that for me?\p" - .string "Oh, that’s right.\n" + .string "Oh, that's right.\n" .string "Could you wait here a second?$" RustboroCity_DevonCorp_3F_Text_212DE8: @ 8212DE8 @@ -301,11 +301,11 @@ RustboroCity_DevonCorp_3F_Text_212E41: @ 8212E41 .string "you should go see CAPT. STERN.$" RustboroCity_DevonCorp_3F_Text_212E88: @ 8212E88 - .string "DEVON’s new products, the REPEAT BALL\n" + .string "DEVON's new products, the REPEAT BALL\n" .string "and TIMER BALL, have become hugely\l" .string "popular among TRAINERS.$" RustboroCity_DevonCorp_3F_Text_212EE9: @ 8212EE9 - .string "It’s a collection of rare rocks and\n" + .string "It's a collection of rare rocks and\n" .string "stones assembled by the PRESIDENT.$" diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc index 947ea14d3..9cff0b010 100644 --- a/data/maps/RustboroCity_Flat1_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_Flat1_1F_MapScripts:: @ 82150CD .byte 0 RustboroCity_Flat1_1F_EventScript_2150CE:: @ 82150CE - msgbox RustboroCity_Flat1_1F_Text_2150E0, 2 + msgbox RustboroCity_Flat1_1F_Text_2150E0, MSGBOX_NPC end RustboroCity_Flat1_1F_EventScript_2150D7:: @ 82150D7 - msgbox RustboroCity_Flat1_1F_Text_215115, 2 + msgbox RustboroCity_Flat1_1F_Text_215115, MSGBOX_NPC end RustboroCity_Flat1_1F_Text_2150E0: @ 82150E0 diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc index 425d61f52..ae0bfcd8e 100644 --- a/data/maps/RustboroCity_Flat1_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc @@ -25,50 +25,50 @@ RustboroCity_Flat1_2F_EventScript_215157:: @ 8215157 end RustboroCity_Flat1_2F_EventScript_21518D:: @ 821518D - msgbox RustboroCity_Flat1_2F_Text_2152FA, 5 + msgbox RustboroCity_Flat1_2F_Text_2152FA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151AD:: @ 82151AD - msgbox RustboroCity_Flat1_2F_Text_215448, 5 + msgbox RustboroCity_Flat1_2F_Text_215448, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_Flat1_2F_EventScript_2151CD - msgbox RustboroCity_Flat1_2F_Text_2154AD, 4 + msgbox RustboroCity_Flat1_2F_Text_2154AD, MSGBOX_DEFAULT goto RustboroCity_Flat1_2F_EventScript_215157 RustboroCity_Flat1_2F_EventScript_2151CD:: @ 82151CD - msgbox RustboroCity_Flat1_2F_Text_2154E7, 4 + msgbox RustboroCity_Flat1_2F_Text_2154E7, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151D7:: @ 82151D7 - msgbox RustboroCity_Flat1_2F_Text_2156E3, 4 + msgbox RustboroCity_Flat1_2F_Text_2156E3, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151E1:: @ 82151E1 - msgbox RustboroCity_Flat1_2F_Text_21561E, 4 + msgbox RustboroCity_Flat1_2F_Text_21561E, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215699, 4 + msgbox RustboroCity_Flat1_2F_Text_215699, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_2151F8:: @ 82151F8 - msgbox RustboroCity_Flat1_2F_Text_215535, 4 + msgbox RustboroCity_Flat1_2F_Text_215535, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_215565, 4 + msgbox RustboroCity_Flat1_2F_Text_215565, MSGBOX_DEFAULT applymovement 6, RustboroCity_Flat1_2F_Movement_27259E waitmovement 0 - msgbox RustboroCity_Flat1_2F_Text_215792, 4 + msgbox RustboroCity_Flat1_2F_Text_215792, MSGBOX_DEFAULT release end RustboroCity_Flat1_2F_EventScript_215221:: @ 8215221 - msgbox RustboroCity_Flat1_2F_Text_2155A4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155A4, MSGBOX_DEFAULT call RustboroCity_Flat1_2F_EventScript_215238 - msgbox RustboroCity_Flat1_2F_Text_2155D4, 4 + msgbox RustboroCity_Flat1_2F_Text_2155D4, MSGBOX_DEFAULT release end @@ -77,20 +77,20 @@ RustboroCity_Flat1_2F_EventScript_215238:: @ 8215238 return RustboroCity_Flat1_2F_EventScript_21523D:: @ 821523D - msgbox RustboroCity_Flat1_2F_Text_21524F, 2 + msgbox RustboroCity_Flat1_2F_Text_21524F, MSGBOX_NPC end RustboroCity_Flat1_2F_EventScript_215246:: @ 8215246 - msgbox RustboroCity_Flat1_2F_Text_215923, 3 + msgbox RustboroCity_Flat1_2F_Text_215923, MSGBOX_SIGN end RustboroCity_Flat1_2F_Text_21524F: @ 821524F - .string "Oh, it’s so hard every day…\p" - .string "What’s hard?\n" + .string "Oh, it's so hard every day…\p" + .string "What's hard?\n" .string "You need to ask?\p" - .string "It’s trying to figure out what to\n" + .string "It's trying to figure out what to\n" .string "make for meals every day.\p" - .string "It really isn’t easy coming up with\n" + .string "It really isn't easy coming up with\n" .string "meals every day.$" RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA @@ -98,80 +98,80 @@ RustboroCity_Flat1_2F_Text_2152FA: @ 82152FA .string "Welcome to the PEPPER household.\p" .string "I have a question for you.\n" .string "Have you ever baby-sat?\p" - .string "You see, I’m a new father, so raising\n" + .string "You see, I'm a new father, so raising\n" .string "a child is all new to me.\p" .string "And I have a problem. My daughter\n" - .string "WALDA doesn’t laugh enough.\p" - .string "I think she’d laugh for me if I told\n" + .string "WALDA doesn't laugh enough.\p" + .string "I think she'd laugh for me if I told\n" .string "her something funny.\p" .string "Do you know of a funny word or\n" .string "phrase you can tell me?$" RustboroCity_Flat1_2F_Text_215448: @ 8215448 - .string "I’ve been saying “{STR_VAR_1}”\n" + .string "I've been saying “{STR_VAR_1}”\n" .string "to amuse her lately.\p" .string "Do you know of a better word or\n" .string "a phrase that might work?$" RustboroCity_Flat1_2F_Text_2154AD: @ 82154AD - .string "Oh, that’s wonderful.\n" - .string "So, let’s hear it, your suggestion.$" + .string "Oh, that's wonderful.\n" + .string "So, let's hear it, your suggestion.$" RustboroCity_Flat1_2F_Text_2154E7: @ 82154E7 .string "Oh, is that right?\p" .string "Well, if you come up with a good\n" - .string "suggestion, I’m all ears.$" + .string "suggestion, I'm all ears.$" RustboroCity_Flat1_2F_Text_215535: @ 8215535 .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" + .string "Well, let's give it a try, shall we?$" RustboroCity_Flat1_2F_Text_215565: @ 8215565 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Oh, yes! She’s laughing!\n" + .string "Oh, yes! She's laughing!\n" .string "Oh, I am as delighted as she!$" RustboroCity_Flat1_2F_Text_2155A4: @ 82155A4 .string "Ah, I see.\n" - .string "Well, let’s give it a try, shall we?$" + .string "Well, let's give it a try, shall we?$" RustboroCity_Flat1_2F_Text_2155D4: @ 82155D4 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" + .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" RustboroCity_Flat1_2F_Text_21561E: @ 821561E - .string "Oh, so you don’t know any good words.\n" - .string "I’d better think for myself, then.\p" + .string "Oh, so you don't know any good words.\n" + .string "I'd better think for myself, then.\p" .string "Hmm…\n" .string "How about “{STR_VAR_1}”?\l" - .string "Let’s see if that will work.$" + .string "Let's see if that will work.$" RustboroCity_Flat1_2F_Text_215699: @ 8215699 .string "{STR_VAR_1}.\n" .string "{STR_VAR_1}.\p" - .string "Hmmm… She’s not smiling at all.\n" + .string "Hmmm… She's not smiling at all.\n" .string "Maybe WALDA is one serious child…$" RustboroCity_Flat1_2F_Text_2156E3: @ 82156E3 - .string "Oh, so you don’t know any good words.\n" - .string "I guess I’ll try to amuse her with\l" + .string "Oh, so you don't know any good words.\n" + .string "I guess I'll try to amuse her with\l" .string "the saying I used before.\p" .string "Anyways, if you have a good suggestion,\n" - .string "don’t hesitate in telling me, okay?$" + .string "don't hesitate in telling me, okay?$" RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "Thank you!\p" .string "Thanks to you, my darling WALDA\n" .string "laughed for me!\p" .string "Actually, I may not look all that\n" - .string "special, but I’m one of DEVON\l" - .string "CORPORATION’s top researchers.\p" + .string "special, but I'm one of DEVON\l" + .string "CORPORATION's top researchers.\p" .string "So, how about I do something in return\n" .string "for you?\p" - .string "I know, I’ll add some new wallpaper\n" + .string "I know, I'll add some new wallpaper\n" .string "patterns for the BOXES in the PC\l" .string "POKéMON Storage System.\p" .string "In the wallpaper pattern menu,\n" @@ -180,5 +180,5 @@ RustboroCity_Flat1_2F_Text_215792: @ 8215792 .string "wallpaper patterns.$" RustboroCity_Flat1_2F_Text_215923: @ 8215923 - .string "It’s a POKéMON plush DOLL!$" + .string "It's a POKéMON plush DOLL!$" diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc index fbb174a29..8fc7e4972 100644 --- a/data/maps/RustboroCity_Flat2_1F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8215F76 .byte 0 RustboroCity_Flat2_1F_EventScript_215F77:: @ 8215F77 - msgbox RustboroCity_Flat2_1F_Text_215F93, 2 + msgbox RustboroCity_Flat2_1F_Text_215F93, MSGBOX_NPC end RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 @@ -10,13 +10,13 @@ RustboroCity_Flat2_1F_EventScript_215F80:: @ 8215F80 faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox RustboroCity_Flat2_1F_Text_215FC6, 4 + msgbox RustboroCity_Flat2_1F_Text_215FC6, MSGBOX_DEFAULT waitmoncry release end RustboroCity_Flat2_1F_Text_215F93: @ 8215F93 - .string "DEVON CORPORATION’s workers live in\n" + .string "DEVON CORPORATION's workers live in\n" .string "this building.$" RustboroCity_Flat2_1F_Text_215FC6: @ 8215FC6 diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index e623aa485..d07babf0c 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7 .byte 0 RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 - msgbox RustboroCity_Flat2_2F_Text_21601A, 2 + msgbox RustboroCity_Flat2_2F_Text_21601A, MSGBOX_NPC end RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 @@ -10,7 +10,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 faceplayer checkflag FLAG_0x0D5 goto_eq RustboroCity_Flat2_2F_EventScript_216010 - msgbox RustboroCity_Flat2_2F_Text_21605A, 4 + msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_eq RustboroCity_Flat2_2F_EventScript_272054 @@ -19,7 +19,7 @@ RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 end RustboroCity_Flat2_2F_EventScript_216010:: @ 8216010 - msgbox RustboroCity_Flat2_2F_Text_2160BD, 4 + msgbox RustboroCity_Flat2_2F_Text_2160BD, MSGBOX_DEFAULT release end @@ -28,12 +28,12 @@ RustboroCity_Flat2_2F_Text_21601A: @ 821601A .string "a teeny, tiny company.$" RustboroCity_Flat2_2F_Text_21605A: @ 821605A - .string "My daddy’s working at the CORPORATION.\p" + .string "My daddy's working at the CORPORATION.\p" .string "My daddy made this!\n" - .string "But I can’t use it, so you can have it.$" + .string "But I can't use it, so you can have it.$" RustboroCity_Flat2_2F_Text_2160BD: @ 82160BD - .string "My daddy’s working at the CORPORATION.\p" - .string "When I grow up, I’m going to work for\n" + .string "My daddy's working at the CORPORATION.\p" + .string "When I grow up, I'm going to work for\n" .string "DEVON, too.$" diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc index 6a267c336..dd5a86dae 100644 --- a/data/maps/RustboroCity_Flat2_3F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc @@ -2,18 +2,18 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8216116 .byte 0 RustboroCity_Flat2_3F_EventScript_216117:: @ 8216117 - msgbox RustboroCity_Flat2_3F_Text_216129, 2 + msgbox RustboroCity_Flat2_3F_Text_216129, MSGBOX_NPC end RustboroCity_Flat2_3F_EventScript_216120:: @ 8216120 - msgbox RustboroCity_Flat2_3F_Text_216159, 2 + msgbox RustboroCity_Flat2_3F_Text_216159, MSGBOX_NPC end RustboroCity_Flat2_3F_Text_216129: @ 8216129 - .string "DEVON’s PRESIDENT likes to collect\n" + .string "DEVON's PRESIDENT likes to collect\n" .string "rare stones.$" RustboroCity_Flat2_3F_Text_216159: @ 8216159 - .string "I think the PRESIDENT’s son also\n" + .string "I think the PRESIDENT's son also\n" .string "collects rare stones.$" diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 1d722b7de..6f161d048 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,13 +2,13 @@ RustboroCity_Gym_MapScripts:: @ 8212F30 .byte 0 RustboroCity_Gym_EventScript_212F31:: @ 8212F31 - trainerbattle 1, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66 + trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_21362A, RustboroCity_Gym_Text_21370B, RustboroCity_Gym_EventScript_212F66, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq RustboroCity_Gym_EventScript_212FC8 checkflag FLAG_0x0A5 goto_if 0, RustboroCity_Gym_EventScript_212FA4 - msgbox RustboroCity_Gym_Text_2139A7, 4 + msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 message RustboroCity_Gym_Text_2137EC waitmessage call RustboroCity_Gym_EventScript_27207E - msgbox RustboroCity_Gym_Text_213816, 4 + msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT setflag FLAG_0x4F0 setflag FLAG_BADGE01_GET setvar VAR_0x405A, 1 @@ -33,28 +33,28 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 compare VAR_RESULT, 0 goto_eq RustboroCity_Gym_EventScript_272054 setflag FLAG_0x0A5 - msgbox RustboroCity_Gym_Text_2138B1, 4 + msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_212FC8:: @ 8212FC8 - trainerbattle 7, TRAINER_ROXANNE_1, 0, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 - msgbox RustboroCity_Gym_Text_213D12, 6 + trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_213C2F, RustboroCity_Gym_Text_213CF9, RustboroCity_Gym_Text_213D93 + msgbox RustboroCity_Gym_Text_213D12, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FE3:: @ 8212FE3 - trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D - msgbox RustboroCity_Gym_Text_213447, 6 + trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_2133E9, RustboroCity_Gym_Text_21342D + msgbox RustboroCity_Gym_Text_213447, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_212FFA:: @ 8212FFA - trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 - msgbox RustboroCity_Gym_Text_2134E6, 6 + trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_213486, RustboroCity_Gym_Text_2134C6 + msgbox RustboroCity_Gym_Text_2134E6, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213011:: @ 8213011 - trainerbattle 0, TRAINER_MARC, 0, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 - msgbox RustboroCity_Gym_Text_2135C0, 6 + trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_213533, RustboroCity_Gym_Text_213589 + msgbox RustboroCity_Gym_Text_2135C0, MSGBOX_AUTOCLOSE end RustboroCity_Gym_EventScript_213028:: @ 8213028 @@ -62,12 +62,12 @@ RustboroCity_Gym_EventScript_213028:: @ 8213028 faceplayer checkflag FLAG_0x4F0 goto_eq RustboroCity_Gym_EventScript_21303D - msgbox RustboroCity_Gym_Text_21309D, 4 + msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end RustboroCity_Gym_EventScript_21303D:: @ 821303D - msgbox RustboroCity_Gym_Text_2132E2, 4 + msgbox RustboroCity_Gym_Text_2132E2, MSGBOX_DEFAULT release end @@ -86,12 +86,12 @@ RustboroCity_Gym_EventScript_213057:: @ 8213057 end RustboroCity_Gym_EventScript_213067:: @ 8213067 - msgbox RustboroCity_Gym_Text_213A3B, 4 + msgbox RustboroCity_Gym_Text_213A3B, MSGBOX_DEFAULT releaseall end RustboroCity_Gym_EventScript_213071:: @ 8213071 - msgbox RustboroCity_Gym_Text_213A21, 4 + msgbox RustboroCity_Gym_Text_213A21, MSGBOX_DEFAULT releaseall end @@ -101,7 +101,7 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B waitmessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox RustboroCity_Gym_Text_213C01, 4 + msgbox RustboroCity_Gym_Text_213C01, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -111,22 +111,22 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B end RustboroCity_Gym_Text_21309D: @ 821309D - .string "Yo, how’s it going?\p" + .string "Yo, how's it going?\p" .string "Listen, my friend!\n" .string "Would you like to become the CHAMPION?\p" - .string "I’m no TRAINER, not me, but I can\n" + .string "I'm no TRAINER, not me, but I can\n" .string "sure give you winning advice.\p" - .string "That’s settled, then! We’ll aim for the\n" + .string "That's settled, then! We'll aim for the\n" .string "POKéMON CHAMPIONSHIP together!\p" - .string "It’s your job as a TRAINER to collect\n" + .string "It's your job as a TRAINER to collect\n" .string "GYM BADGES, am I right?\p" - .string "But GYM LEADERS aren’t pushovers!\p" - .string "And that’s where I come in!\n" - .string "I’m here to provide expert advice!\p" + .string "But GYM LEADERS aren't pushovers!\p" + .string "And that's where I come in!\n" + .string "I'm here to provide expert advice!\p" .string "ROXANNE, the GYM LEADER, is a user\n" .string "of ROCK-type POKéMON.\p" .string "The ROCK type is very durable, but\n" - .string "it can’t stand WATER-type and\l" + .string "it can't stand WATER-type and\l" .string "GRASS-type moves.\p" .string "Come see me afterwards, if you beat\n" .string "the GYM LEADER.\p" @@ -134,38 +134,38 @@ RustboroCity_Gym_Text_21309D: @ 821309D RustboroCity_Gym_Text_2132E2: @ 82132E2 .string "Whoa! What a breathtaking victory!\n" - .string "My cheering must’ve worked!\p" + .string "My cheering must've worked!\p" .string "Great!\n" .string "Check your TRAINER CARD.\p" .string "The STONE BADGE you got should be\n" .string "properly recorded on it.\p" .string "In other words…\p" - .string "You’ve climbed the first step on\n" + .string "You've climbed the first step on\n" .string "the stairs to the CHAMPIONSHIP!\p" - .string "That’s got to feel awesome!$" + .string "That's got to feel awesome!$" RustboroCity_Gym_Text_2133E9: @ 82133E9 - .string "Don’t take us GYM TRAINERS lightly!\n" - .string "I’ll show you why we’re better!$" + .string "Don't take us GYM TRAINERS lightly!\n" + .string "I'll show you why we're better!$" RustboroCity_Gym_Text_21342D: @ 821342D .string "You were too good for me…$" RustboroCity_Gym_Text_213447: @ 8213447 - .string "You haven’t seen anything of the ROCK\n" - .string "type’s terrifying power!$" + .string "You haven't seen anything of the ROCK\n" + .string "type's terrifying power!$" RustboroCity_Gym_Text_213486: @ 8213486 - .string "If you can’t beat me, you won’t stand\n" + .string "If you can't beat me, you won't stand\n" .string "a chance against ROXANNE!$" RustboroCity_Gym_Text_2134C6: @ 82134C6 - .string "Wow! You’ve got some potential!$" + .string "Wow! You've got some potential!$" RustboroCity_Gym_Text_2134E6: @ 82134E6 .string "ROXANNE is stronger than me by\n" .string "several times.\p" - .string "You’d better be on your guard!$" + .string "You'd better be on your guard!$" RustboroCity_Gym_Text_213533: @ 8213533 .string "We might be in the middle of town,\n" @@ -187,7 +187,7 @@ RustboroCity_Gym_Text_21362A: @ 821362A .string "POKéMON GYM LEADER.\p" .string "I became a GYM LEADER so that I might\n" .string "apply what I learned at the POKéMON\l" - .string "TRAINER’S SCHOOL in battle.\p" + .string "TRAINER'S SCHOOL in battle.\p" .string "Would you kindly demonstrate how you\n" .string "battle, and with which POKéMON?$" @@ -197,7 +197,7 @@ RustboroCity_Gym_Text_21370B: @ 821370B .string "It seems that I still have much more\n" .string "to learn…\p" .string "I understand.\p" - .string "The POKéMON LEAGUE’s rules state\n" + .string "The POKéMON LEAGUE's rules state\n" .string "that TRAINERS are to be given this\l" .string "if they defeat a GYM LEADER.\p" .string "Please accept the official POKéMON\n" @@ -235,7 +235,7 @@ RustboroCity_Gym_Text_213A21: @ 8213A21 RustboroCity_Gym_Text_213A3B: @ 8213A3B .string "RUSTBORO CITY POKéMON GYM\p" - .string "ROXANNE’S CERTIFIED TRAINERS:\n" + .string "ROXANNE'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" @@ -244,14 +244,14 @@ RustboroCity_Gym_Text_213A76: @ 8213A76 .string "… … … … … Beep!\p" .string "ROXANNE: Oh, hello, {PLAYER}?\n" .string "This is ROXANNE of RUSTBORO CITY.\p" - .string "I heard from BRAWLY that you’re\n" + .string "I heard from BRAWLY that you're\n" .string "moving up through the ranks of\l" .string "TRAINERS at an incredible clip.\p" - .string "Well, I’d rather not think that\n" - .string "I can’t beat you.\p" + .string "Well, I'd rather not think that\n" + .string "I can't beat you.\p" .string "I promise, I will shape up my GYM\n" .string "so that you may challenge us again.\p" - .string "I hope you’ll be looking forward to\n" + .string "I hope you'll be looking forward to\n" .string "that occasion as much as me!\p" .string "… … … … … …\n" .string "… … … … … Click!$" @@ -261,12 +261,12 @@ RustboroCity_Gym_Text_213C01: @ 8213C01 .string "in the POKéNAV.$" RustboroCity_Gym_Text_213C2F: @ 8213C2F - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" + .string "ROXANNE: I'm so glad to see you again.\n" + .string "I'm ROXANNE, the GYM LEADER here.\p" + .string "I'm sure we've both experienced many\n" .string "battles since we last met.\p" .string "I would like to see how much better\n" - .string "we’ve become. Let us battle!$" + .string "we've become. Let us battle!$" RustboroCity_Gym_Text_213CF9: @ 8213CF9 .string "Grr…\n" @@ -279,12 +279,12 @@ RustboroCity_Gym_Text_213D12: @ 8213D12 .string "all that much more!$" RustboroCity_Gym_Text_213D93: @ 8213D93 - .string "ROXANNE: I’m so glad to see you again.\n" - .string "I’m ROXANNE, the GYM LEADER here.\p" - .string "I’m sure we’ve both experienced many\n" + .string "ROXANNE: I'm so glad to see you again.\n" + .string "I'm ROXANNE, the GYM LEADER here.\p" + .string "I'm sure we've both experienced many\n" .string "battles since we last met.\p" .string "I would like to see how much better\n" - .string "we’ve become…\p" + .string "we've become…\p" .string "Oh, no…\n" .string "You only have one POKéMON with you?\p" .string "Please return with at least one more\n" diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index d63536c55..8bc43c0c2 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -10,7 +10,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C copyvar VAR_0x8009, VAR_RESULT - msgbox RustboroCity_House1_Text_2159E8, 5 + msgbox RustboroCity_House1_Text_2159E8, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq RustboroCity_House1_EventScript_2159BD special sub_81B94B0 @@ -28,37 +28,37 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F special sub_807EA10 special sub_807F0E4 waitstate - msgbox RustboroCity_House1_Text_215A77, 4 + msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT setflag FLAG_0x099 release end RustboroCity_House1_EventScript_2159BD:: @ 82159BD - msgbox RustboroCity_House1_Text_215ACE, 4 + msgbox RustboroCity_House1_Text_215ACE, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159C7:: @ 82159C7 bufferspeciesname 0, VAR_0x8009 - msgbox RustboroCity_House1_Text_215A9D, 4 + msgbox RustboroCity_House1_Text_215A9D, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159D5:: @ 82159D5 - msgbox RustboroCity_House1_Text_215B17, 4 + msgbox RustboroCity_House1_Text_215B17, MSGBOX_DEFAULT release end RustboroCity_House1_EventScript_2159DF:: @ 82159DF - msgbox RustboroCity_House1_Text_215B57, 2 + msgbox RustboroCity_House1_Text_215B57, MSGBOX_NPC end RustboroCity_House1_Text_2159E8: @ 82159E8 .string "Huh? My POKéMON is cute?\n" .string "Sure, I knew that.\p" - .string "But if you really want, I’m willing\n" + .string "But if you really want, I'm willing\n" .string "to trade it to you.\p" - .string "I’ll trade you my {STR_VAR_2} for\n" + .string "I'll trade you my {STR_VAR_2} for\n" .string "a {STR_VAR_1} if you want.$" RustboroCity_House1_Text_215A77: @ 8215A77 @@ -66,11 +66,11 @@ RustboroCity_House1_Text_215A77: @ 8215A77 .string "Please be good to my POKéMON.$" RustboroCity_House1_Text_215A9D: @ 8215A9D - .string "Huh? That doesn’t look anything like\n" + .string "Huh? That doesn't look anything like\n" .string "a {STR_VAR_1} to me.$" RustboroCity_House1_Text_215ACE: @ 8215ACE - .string "Oh, if you don’t want to, that’s okay.\n" + .string "Oh, if you don't want to, that's okay.\n" .string "But my POKéMON is cute, you know…$" RustboroCity_House1_Text_215B17: @ 8215B17 diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc index fd71dc016..632eb6877 100644 --- a/data/maps/RustboroCity_House2/scripts.inc +++ b/data/maps/RustboroCity_House2/scripts.inc @@ -2,20 +2,20 @@ RustboroCity_House2_MapScripts:: @ 8215EB3 .byte 0 RustboroCity_House2_EventScript_215EB4:: @ 8215EB4 - msgbox RustboroCity_House2_Text_215EC6, 2 + msgbox RustboroCity_House2_Text_215EC6, MSGBOX_NPC end RustboroCity_House2_EventScript_215EBD:: @ 8215EBD - msgbox RustboroCity_House2_Text_215F21, 2 + msgbox RustboroCity_House2_Text_215F21, MSGBOX_NPC end RustboroCity_House2_Text_215EC6: @ 8215EC6 - .string "The TRAINER’S SCHOOL is excellent.\p" + .string "The TRAINER'S SCHOOL is excellent.\p" .string "If you study there, you could even\n" .string "become a GYM LEADER.$" RustboroCity_House2_Text_215F21: @ 8215F21 .string "ROXANNE, the GYM LEADER, really knows\n" .string "a lot about POKéMON.\p" - .string "She’s really strong, too!$" + .string "She's really strong, too!$" diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc index 87d278099..04992fbba 100644 --- a/data/maps/RustboroCity_House3/scripts.inc +++ b/data/maps/RustboroCity_House3/scripts.inc @@ -2,11 +2,11 @@ RustboroCity_House3_MapScripts:: @ 8216190 .byte 0 RustboroCity_House3_EventScript_216191:: @ 8216191 - msgbox RustboroCity_House3_Text_2161B6, 2 + msgbox RustboroCity_House3_Text_2161B6, MSGBOX_NPC end RustboroCity_House3_EventScript_21619A:: @ 821619A - msgbox RustboroCity_House3_Text_21622A, 2 + msgbox RustboroCity_House3_Text_21622A, MSGBOX_NPC end RustboroCity_House3_EventScript_2161A3:: @ 82161A3 @@ -14,7 +14,7 @@ RustboroCity_House3_EventScript_2161A3:: @ 82161A3 faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox RustboroCity_House3_Text_2162AB, 4 + msgbox RustboroCity_House3_Text_2162AB, MSGBOX_DEFAULT waitmoncry release end @@ -22,14 +22,14 @@ RustboroCity_House3_EventScript_2161A3:: @ 82161A3 RustboroCity_House3_Text_2161B6: @ 82161B6 .string "For my own POKéMON, I give them\n" .string "perfectly suited nicknames!\p" - .string "It’s my expression of, uh…\n" - .string "originality, yes, that’s it!$" + .string "It's my expression of, uh…\n" + .string "originality, yes, that's it!$" RustboroCity_House3_Text_21622A: @ 821622A .string "But giving the name PEKACHU to\n" .string "a PIKACHU? It seems pointless.\p" .string "I suppose it is good to use a name\n" - .string "that’s easy to understand, but…$" + .string "that's easy to understand, but…$" RustboroCity_House3_Text_2162AB: @ 82162AB .string "PEKACHU: Peka!$" diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index daa445a0e..17406b0ac 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -14,7 +14,7 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 RustboroCity_Mart_EventScript_214F21:: @ 8214F21 pokemart RustboroCity_Mart_Pokemart_214F30 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -35,7 +35,7 @@ RustboroCity_Mart_Pokemart_214F30: @ 8214F30 RustboroCity_Mart_EventScript_214F48:: @ 8214F48 pokemart RustboroCity_Mart_Pokemart_214F58 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -58,19 +58,19 @@ RustboroCity_Mart_Pokemart_214F58: @ 8214F58 end RustboroCity_Mart_EventScript_214F74:: @ 8214F74 - msgbox RustboroCity_Mart_Text_214F8F, 2 + msgbox RustboroCity_Mart_Text_214F8F, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F7D:: @ 8214F7D - msgbox RustboroCity_Mart_Text_214FF1, 2 + msgbox RustboroCity_Mart_Text_214FF1, MSGBOX_NPC end RustboroCity_Mart_EventScript_214F86:: @ 8214F86 - msgbox RustboroCity_Mart_Text_21505C, 2 + msgbox RustboroCity_Mart_Text_21505C, MSGBOX_NPC end RustboroCity_Mart_Text_214F8F: @ 8214F8F - .string "I’m buying some PARLYZ HEALS and\n" + .string "I'm buying some PARLYZ HEALS and\n" .string "ANTIDOTES.\p" .string "Just in case I run into SHROOMISH\n" .string "in PETALBURG WOODS.$" @@ -82,7 +82,7 @@ RustboroCity_Mart_Text_214FF1: @ 8214FF1 .string "instead of ordinary POTIONS.$" RustboroCity_Mart_Text_21505C: @ 821505C - .string "I’m getting an ESCAPE ROPE just in\n" + .string "I'm getting an ESCAPE ROPE just in\n" .string "case I get lost in a cave.\p" .string "I just need to use it to get back to\n" .string "the entrance.$" diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index acf33e647..f76603dbd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -17,28 +17,28 @@ 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 .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" diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index f5030facd..330afd30c 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8 RustboroCity_PokemonSchool_EventScript_213EA9:: @ 8213EA9 lockall - msgbox RustboroCity_PokemonSchool_Text_2140B2, 4 + msgbox RustboroCity_PokemonSchool_Text_2140B2, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_213EB8:: @ 8213EB8 end RustboroCity_PokemonSchool_EventScript_213F17:: @ 8213F17 - msgbox RustboroCity_PokemonSchool_Text_21411A, 4 + msgbox RustboroCity_PokemonSchool_Text_21411A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F25:: @ 8213F25 - msgbox RustboroCity_PokemonSchool_Text_2141D8, 4 + msgbox RustboroCity_PokemonSchool_Text_2141D8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F33:: @ 8213F33 - msgbox RustboroCity_PokemonSchool_Text_21427D, 4 + msgbox RustboroCity_PokemonSchool_Text_21427D, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F41:: @ 8213F41 - msgbox RustboroCity_PokemonSchool_Text_214336, 4 + msgbox RustboroCity_PokemonSchool_Text_214336, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end RustboroCity_PokemonSchool_EventScript_213F4F:: @ 8213F4F - msgbox RustboroCity_PokemonSchool_Text_2143B8, 4 + msgbox RustboroCity_PokemonSchool_Text_2143B8, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_213EB8 end @@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_213F5D:: @ 8213F5D end RustboroCity_PokemonSchool_EventScript_213F5F:: @ 8213F5F - msgbox RustboroCity_PokemonSchool_Text_21459F, 2 + msgbox RustboroCity_PokemonSchool_Text_21459F, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F68:: @ 8213F68 - msgbox RustboroCity_PokemonSchool_Text_2145CD, 2 + msgbox RustboroCity_PokemonSchool_Text_2145CD, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F71:: @ 8213F71 - msgbox RustboroCity_PokemonSchool_Text_214604, 2 + msgbox RustboroCity_PokemonSchool_Text_214604, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F7A:: @ 8213F7A - msgbox RustboroCity_PokemonSchool_Text_214669, 2 + msgbox RustboroCity_PokemonSchool_Text_214669, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F83:: @ 8213F83 - msgbox RustboroCity_PokemonSchool_Text_214719, 2 + msgbox RustboroCity_PokemonSchool_Text_214719, MSGBOX_NPC end RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C - msgbox RustboroCity_PokemonSchool_Text_2147A2, 3 + msgbox RustboroCity_PokemonSchool_Text_2147A2, MSGBOX_SIGN end RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 @@ -83,7 +83,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 call_if 1, RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_213FF0 - msgbox RustboroCity_PokemonSchool_Text_214433, 4 + msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT giveitem_std ITEM_QUICK_CLAW compare VAR_RESULT, 0 goto_eq RustboroCity_PokemonSchool_EventScript_272054 @@ -105,7 +105,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0 return RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB - msgbox RustboroCity_PokemonSchool_Text_2144C8, 4 + msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 @@ -173,7 +173,7 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 goto_eq RustboroCity_PokemonSchool_EventScript_21406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214082 - msgbox RustboroCity_PokemonSchool_Text_2148C0, 4 + msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x136 release @@ -182,17 +182,17 @@ RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 RustboroCity_PokemonSchool_EventScript_21406F:: @ 821406F checkflag FLAG_BADGE01_GET goto_eq RustboroCity_PokemonSchool_EventScript_214090 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end RustboroCity_PokemonSchool_EventScript_214082:: @ 8214082 - msgbox RustboroCity_PokemonSchool_Text_214B8A, 4 + msgbox RustboroCity_PokemonSchool_Text_214B8A, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 - msgbox RustboroCity_PokemonSchool_Text_214AB6, 4 + msgbox RustboroCity_PokemonSchool_Text_214AB6, MSGBOX_DEFAULT goto RustboroCity_PokemonSchool_EventScript_21409E end @@ -203,7 +203,7 @@ RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E end RustboroCity_PokemonSchool_EventScript_2140A8:: @ 82140A8 - msgbox RustboroCity_PokemonSchool_Text_214A5F, 4 + msgbox RustboroCity_PokemonSchool_Text_214A5F, MSGBOX_DEFAULT release end @@ -219,7 +219,7 @@ RustboroCity_PokemonSchool_Text_21411A: @ 821411A .string "steadily lose HP.\p" .string "The effects of poison remain after\n" .string "a battle.\p" - .string "A poisoned POKéMON’s HP will drop\n" + .string "A poisoned POKéMON's HP will drop\n" .string "while it is traveling.\p" .string "Heal a poisoning using an ANTIDOTE.$" @@ -241,7 +241,7 @@ RustboroCity_PokemonSchool_Text_21427D: @ 821427D RustboroCity_PokemonSchool_Text_214336: @ 8214336 .string "A burn reduces ATTACK power, and it\n" - .string "steadily reduces the victim’s HP.\p" + .string "steadily reduces the victim's HP.\p" .string "A burn lingers after battle.\n" .string "Cure a burn using a BURN HEAL.$" @@ -252,7 +252,7 @@ RustboroCity_PokemonSchool_Text_2143B8: @ 82143B8 .string "Thaw it out using an ICE HEAL.$" RustboroCity_PokemonSchool_Text_214433: @ 8214433 - .string "Students who don’t study get a little\n" + .string "Students who don't study get a little\n" .string "taste of my QUICK CLAW.\p" .string "Whether or not you are a good student \n" .string "will be evident from the way you use\l" @@ -268,16 +268,16 @@ RustboroCity_PokemonSchool_Text_2144C8: @ 82144C8 .string "topics to study!$" RustboroCity_PokemonSchool_Text_21459F: @ 821459F - .string "I’m trading POKéMON with my friend\n" + .string "I'm trading POKéMON with my friend\n" .string "right now.$" RustboroCity_PokemonSchool_Text_2145CD: @ 82145CD .string "I always wanted a SEEDOT, and\n" - .string "I’m finally getting one!$" + .string "I'm finally getting one!$" RustboroCity_PokemonSchool_Text_214604: @ 8214604 .string "POKéMON can hold items, but they\n" - .string "don’t know what to do with man-made\l" + .string "don't know what to do with man-made\l" .string "items like POTION and ANTIDOTE.$" RustboroCity_PokemonSchool_Text_214669: @ 8214669 @@ -297,7 +297,7 @@ RustboroCity_PokemonSchool_Text_214719: @ 8214719 .string "down…$" RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 - .string "It’s this student’s notebook…\p" + .string "It's this student's notebook…\p" .string "POKéMON are to be caught using\n" .string "POKé BALLS.\p" .string "Up to six POKéMON can accompany\n" @@ -305,18 +305,18 @@ RustboroCity_PokemonSchool_Text_2147A2: @ 82147A2 .string "A TRAINER is someone who catches\n" .string "POKéMON, raises them, and battles\l" .string "with them.\p" - .string "A TRAINER’s mission is to defeat\n" + .string "A TRAINER's mission is to defeat\n" .string "the strong TRAINERS who await\l" .string "challengers in POKéMON GYMS.$" RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 - .string "Hello? Didn’t we meet before?\n" + .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" + .string "My name's SCOTT.\p" + .string "I've been traveling everywhere in\n" .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" + .string "More specifically, I'm looking for\n" .string "POKéMON battle experts.\p" .string "So, what brings you to this SCHOOL?\n" .string "Are you a TRAINER, too?\p" @@ -328,32 +328,32 @@ RustboroCity_PokemonSchool_Text_2148C0: @ 82148C0 RustboroCity_PokemonSchool_Text_214A5F: @ 8214A5F .string "SCOTT: Hmm…\p" .string "The talent levels of the students here\n" - .string "are unknown. The potential’s there.$" + .string "are unknown. The potential's there.$" RustboroCity_PokemonSchool_Text_214AB6: @ 8214AB6 - .string "SCOTT: Oh, what’s that?\p" - .string "It’s a STONE BADGE, isn’t it?\n" - .string "That’s pretty impressive, I’d say.\p" - .string "But, you know, I would’ve loved to see\n" + .string "SCOTT: Oh, what's that?\p" + .string "It's a STONE BADGE, isn't it?\n" + .string "That's pretty impressive, I'd say.\p" + .string "But, you know, I would've loved to see\n" .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" + .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" RustboroCity_PokemonSchool_Text_214B8A: @ 8214B8A - .string "Hello? Didn’t we meet before?\n" + .string "Hello? Didn't we meet before?\n" .string "I think back in PETALBURG CITY.\p" .string "Let me introduce myself.\n" - .string "My name’s SCOTT.\p" - .string "I’ve been traveling everywhere in\n" + .string "My name's SCOTT.\p" + .string "I've been traveling everywhere in\n" .string "search of outstanding TRAINERS.\p" - .string "More specifically, I’m looking for\n" + .string "More specifically, I'm looking for\n" .string "POKéMON battle experts.\p" - .string "Oh, what’s that?\n" - .string "It’s a STONE BADGE, isn’t it?\p" - .string "That’s pretty impressive, I’d say, for\n" + .string "Oh, what's that?\n" + .string "It's a STONE BADGE, isn't it?\p" + .string "That's pretty impressive, I'd say, for\n" .string "a starting TRAINER like yourself.\p" - .string "But, you know, I would’ve loved to see\n" + .string "But, you know, I would've loved to see\n" .string "you in battle.\p" - .string "It’s hard to tell what you’re like as\n" + .string "It's hard to tell what you're like as\n" .string "a TRAINER from a LEAGUE BADGE.$" diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 86f9c3b2f..1eaaba66c 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -21,7 +21,7 @@ RusturfTunnel_EventScript_22CE50:: @ 822CE50 RusturfTunnel_EventScript_22CE5F:: @ 822CE5F lock faceplayer - msgbox RusturfTunnel_Text_22D7A3, 4 + msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -34,7 +34,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 checkflag FLAG_TEMP_1 goto_eq RusturfTunnel_EventScript_22CE99 setflag FLAG_TEMP_1 - msgbox RusturfTunnel_Text_22D510, 4 + msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -42,7 +42,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76 end RusturfTunnel_EventScript_22CE99:: @ 822CE99 - msgbox RusturfTunnel_Text_22D5F3, 4 + msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2 waitmovement 0 @@ -58,14 +58,14 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC7 call RusturfTunnel_EventScript_22CFFF - msgbox RusturfTunnel_Text_22D65C, 4 + msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_22CFC8 compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 setflag FLAG_0x06A - msgbox RusturfTunnel_Text_22D6D2, 4 + msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CF5D @@ -73,7 +73,7 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE call_if 1, RusturfTunnel_EventScript_22CF6F compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_22CF8B - msgbox RusturfTunnel_Text_22D745, 4 + msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_22CFD4 @@ -281,7 +281,7 @@ RusturfTunnel_EventScript_22D07D:: @ 822D07D RusturfTunnel_EventScript_22D083:: @ 822D083 lockall - msgbox RusturfTunnel_Text_22D1C8, 4 + msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT closemessage applymovement 6, RusturfTunnel_Movement_22D0AB applymovement 7, RusturfTunnel_Movement_22D0AB @@ -303,7 +303,7 @@ RusturfTunnel_EventScript_22D0AF:: @ 822D0AF faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox RusturfTunnel_Text_22D1F7, 4 + msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT waitmoncry release end @@ -312,9 +312,9 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 lock faceplayer playbgm MUS_AQA_0, 0 - msgbox RusturfTunnel_Text_22D20A, 4 - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, 4 + msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0 + msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_22D178 @@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 applymovement 255, RusturfTunnel_Movement_22D17E applymovement 5, RusturfTunnel_Movement_22D1A4 waitmovement 0 - msgbox RusturfTunnel_Text_22D395, 4 + msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT applymovement 5, RusturfTunnel_Movement_27259E waitmovement 0 message RusturfTunnel_Text_22D3BA @@ -426,8 +426,8 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, 6 + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end RusturfTunnel_Text_22D1C8: @ 822D1C8 @@ -461,7 +461,7 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1 RusturfTunnel_Text_22D395: @ 822D395 .string "PEEKO!\n" - .string "Am I glad to see you’re safe!$" + .string "Am I glad to see you're safe!$" RusturfTunnel_Text_22D3BA: @ 822D3BA .string "PEEKO owes her life to you!\p" @@ -471,8 +471,8 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA .string "… … … … … … … …\p" .string "Ah, so you are {PLAYER}{KUN}!\n" .string "I sincerely thank you!\p" - .string "Now, if there’s anything that troubles\n" - .string "you, don’t hesitate to tell me!\p" + .string "Now, if there's anything that troubles\n" + .string "you, don't hesitate to tell me!\p" .string "You can usually find me in my cottage\n" .string "by the sea near PETALBURG WOODS.\p" .string "Come, PEEKO, we should make our way\n" @@ -481,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA RusturfTunnel_Text_22D510: @ 822D510 .string "… …\p" - .string "Why can’t they keep digging?\n" + .string "Why can't they keep digging?\n" .string "Is the bedrock too hard?\p" .string "My beloved awaits me in VERDANTURF\n" .string "TOWN just beyond here…\p" @@ -500,7 +500,7 @@ RusturfTunnel_Text_22D65C: @ 822D65C .string "Wow! You shattered that boulder\n" .string "blocking the way.\p" .string "To show you how much I appreciate it,\n" - .string "I’d like you to have this HM.$" + .string "I'd like you to have this HM.$" RusturfTunnel_Text_22D6D2: @ 822D6D2 .string "That HM contains STRENGTH.\p" @@ -511,13 +511,13 @@ RusturfTunnel_Text_22D6D2: @ 822D6D2 RusturfTunnel_Text_22D745: @ 822D745 .string "WANDA!\n" .string "Now I can see you anytime!\p" - .string "WANDA: That’s…wonderful.\p" + .string "WANDA: That's…wonderful.\p" .string "Please, take some rest at my home.$" RusturfTunnel_Text_22D7A3: @ 822D7A3 .string "On the other side of this rock…\n" .string "My boyfriend is there.\p" - .string "He… He’s not just digging the tunnel\n" + .string "He… He's not just digging the tunnel\n" .string "to come see me.\p" .string "He works his hands raw and rough\n" .string "for the benefit of everyone.$" @@ -525,7 +525,7 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3 RusturfTunnel_Text_22D84D: @ 822D84D .string "What do you call a wild man up in the\n" .string "mountains? A mountain man, right?\p" - .string "So why don’t they call a POKéMON in\n" + .string "So why don't they call a POKéMON in\n" .string "the mountains a mountain POKéMON?$" RusturfTunnel_Text_22D8DB: @ 822D8DB @@ -535,5 +535,5 @@ RusturfTunnel_Text_22D8DB: @ 822D8DB RusturfTunnel_Text_22D8F9: @ 822D8F9 .string "They halted development here to\n" .string "protect POKéMON, right?\l" - .string "There’s a feel-good story!$" + .string "There's a feel-good story!$" diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index d53973e87..15b0ba8e1 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -15,7 +15,7 @@ SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF setvar VAR_PORTHOLE_STATE, 2 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C462, 4 + msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT releaseall end @@ -23,7 +23,7 @@ SSTidalCorridor_EventScript_23C015:: @ 823C015 setvar VAR_PORTHOLE_STATE, 6 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -31,14 +31,14 @@ SSTidalRooms_EventScript_23C028:: @ 823C028 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 playse SE_PINPON - msgbox SSTidalRooms_Text_23C462, 4 + msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C03C:: @ 823C03C special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 playse SE_PINPON - msgbox SSTidalRooms_Text_23C553, 4 + msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT return SSTidalCorridor_EventScript_23C050:: @ 823C050 @@ -53,7 +53,7 @@ SSTidalCorridor_EventScript_23C067:: @ 823C067 setvar VAR_PORTHOLE_STATE, 3 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, 4 + msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT releaseall end @@ -62,7 +62,7 @@ SSTidalCorridor_EventScript_23C07D:: @ 823C07D setvar VAR_PORTHOLE_STATE, 8 lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C50F, 4 + msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT releaseall end @@ -70,7 +70,7 @@ SSTidalRooms_EventScript_23C093:: @ 823C093 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 playse SE_PINPON - msgbox SSTidalRooms_Text_23C50F, 4 + msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT return SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 @@ -82,7 +82,7 @@ SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 return SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 - msgbox SSTidalCorridor_Text_23C6EC, 2 + msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC end SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 @@ -90,25 +90,25 @@ SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_23C7E1, 4 + msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT waitmoncry release end SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 - msgbox SSTidalCorridor_Text_23C7F8, 3 + msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE - msgbox SSTidalCorridor_Text_23C800, 3 + msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C107:: @ 823C107 - msgbox SSTidalCorridor_Text_23C808, 3 + msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C110:: @ 823C110 - msgbox SSTidalCorridor_Text_23C810, 3 + msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN end SSTidalCorridor_EventScript_23C119:: @ 823C119 @@ -118,13 +118,13 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 goto_eq SSTidalCorridor_EventScript_23C13B compare VAR_PORTHOLE_STATE, 8 goto_eq SSTidalCorridor_EventScript_23C15A - msgbox SSTidalCorridor_Text_23C596, 4 + msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY - msgbox SSTidalCorridor_Text_23C64F, 4 + msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT checkflag FLAG_0x104 call_if 1, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -152,7 +152,7 @@ SSTidalCorridor_EventScript_23C17D:: @ 823C17D goto_eq SSTidalCorridor_EventScript_23C19E compare VAR_PORTHOLE_STATE, 7 goto_eq SSTidalCorridor_EventScript_23C19E - msgbox SSTidalCorridor_Text_23C6C3, 4 + msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT releaseall end @@ -167,12 +167,12 @@ SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 checkflag FLAG_0x0F7 goto_eq SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 - msgbox SSTidalCorridor_Text_23C65E, 4 + msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release end SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD - msgbox SSTidalCorridor_Text_23C6B0, 4 + msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT release end @@ -206,7 +206,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 waitmovement 0 applymovement 255, SSTidalCorridor_Movement_2725A8 waitmovement 0 - msgbox SSTidalCorridor_Text_23C28F, 4 + msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT closemessage applymovement 255, SSTidalCorridor_Movement_23C27D applymovement 1, SSTidalCorridor_Movement_23C284 @@ -270,21 +270,21 @@ SSTidalCorridor_Movement_23C28B: @ 823C28B SSTidalCorridor_Text_23C28F: @ 823C28F .string "SCOTT: Well, hi, hi!\n" .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" - .string "Something’s come up, so I have to\n" + .string "Something's come up, so I have to\n" .string "disembark, but am I glad to see you!\p" .string "Congratulations, LEAGUE CHAMPION!\p" - .string "There’s a place I’d like to invite\n" + .string "There's a place I'd like to invite\n" .string "someone like you.\p" - .string "It’s the…\n" + .string "It's the…\n" .string "BATTLE FRONTIER!\p" - .string "What’s the place like?\n" - .string "You’ll understand when you see it!\p" - .string "I’ve spoken with the ship’s CAPTAIN\n" + .string "What's the place like?\n" + .string "You'll understand when you see it!\p" + .string "I've spoken with the ship's CAPTAIN\n" .string "about this.\p" .string "The next time you take a ferry,\n" .string "you should be able to sail to\l" .string "the BATTLE FRONTIER.\p" - .string "Okay, {PLAYER}{KUN}, I’ll be waiting for you\n" + .string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n" .string "at the BATTLE FRONTIER!$" SSTidalCorridor_Text_23C462: @ 823C462 @@ -308,15 +308,15 @@ SSTidalRooms_Text_23C553: @ 823C553 .string "Thank you for sailing with us.$" SSTidalCorridor_Text_23C596: @ 823C596 - .string "It’ll be some time before we make land,\n" + .string "It'll be some time before we make land,\n" .string "I reckon.\p" - .string "You can rest up in your cabin if you’d\n" - .string "like. Your cabin’s No. 2.\p" + .string "You can rest up in your cabin if you'd\n" + .string "like. Your cabin's No. 2.\p" .string "The bed in there is soft and plushy.\n" .string "I can attest to how comfy it is!$" SSTidalCorridor_Text_23C64F: @ 823C64F - .string "We’ve arrived!$" + .string "We've arrived!$" SSTidalCorridor_Text_23C65E: @ 823C65E .string "Go visit other cabins.\n" diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 2ad1ed580..68761376d 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,38 +2,38 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 .byte 0 SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 - msgbox SSTidalLowerDeck_Text_23C8B4, 6 + trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 + msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D - msgbox SSTidalLowerDeck_Text_23C98E, 6 + trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D + msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE end SSTidalLowerDeck_Text_23C847: @ 823C847 - .string "Arrrgh! I’m fed up and dog-tired of\n" + .string "Arrrgh! I'm fed up and dog-tired of\n" .string "cleaning this huge place!\p" - .string "Let’s have a quick battle!$" + .string "Let's have a quick battle!$" SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 .string "Little bro, I lost!$" SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 - .string "We’re the CLEANUP BROTHERS!\p" + .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" SSTidalLowerDeck_Text_23C917: @ 823C917 - .string "This is the bottom of the ship’s hull.\n" - .string "There’s plenty of room.\l" - .string "It’ll be alright for a POKéMON battle.$" + .string "This is the bottom of the ship's hull.\n" + .string "There's plenty of room.\l" + .string "It'll be alright for a POKéMON battle.$" SSTidalLowerDeck_Text_23C97D: @ 823C97D .string "Big bro, I lost!$" SSTidalLowerDeck_Text_23C98E: @ 823C98E - .string "We’re the CLEANUP BROTHERS!\p" + .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 39c453e98..7d774e491 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -6,23 +6,23 @@ SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 faceplayer checkflag FLAG_0x104 goto_eq SSTidalRooms_EventScript_23CA29 - msgbox SSTidalRooms_Text_23D098, 4 + msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 goto_eq SSTidalRooms_EventScript_272054 setflag FLAG_0x104 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA29:: @ 823CA29 - msgbox SSTidalRooms_Text_23D145, 4 + msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end SSTidalRooms_EventScript_23CA33:: @ 823CA33 lockall - msgbox SSTidalRooms_Text_23CAF2, 4 + msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT closemessage call SSTidalRooms_EventScript_272083 call SSTidalRooms_EventScript_23C0A7 @@ -30,43 +30,43 @@ SSTidalRooms_EventScript_23CA33:: @ 823CA33 end SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 - msgbox SSTidalRooms_Text_23CB75, 6 + trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 + msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle 0, TRAINER_MICAH, 0, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 - msgbox SSTidalRooms_Text_23CC26, 6 + trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 + msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A - msgbox SSTidalRooms_Text_23CCBB, 6 + trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A + msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CA8E:: @ 823CA8E - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 - msgbox SSTidalRooms_Text_23CD5F, 6 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 + msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 - trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 - msgbox SSTidalRooms_Text_23CE59, 6 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 + msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 - msgbox SSTidalRooms_Text_23CF45, 6 + trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 + msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE end SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle 0, TRAINER_NAOMI, 0, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 - msgbox SSTidalRooms_Text_23D013, 6 + trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 + msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE end SSTidalRooms_Text_23CAF2: @ 823CAF2 - .string "There’s a bed…\n" - .string "Let’s take a rest.$" + .string "There's a bed…\n" + .string "Let's take a rest.$" SSTidalRooms_Text_23CB14: @ 823CB14 .string "I often sail to LILYCOVE CITY.\p" @@ -78,7 +78,7 @@ SSTidalRooms_Text_23CB58: @ 823CB58 SSTidalRooms_Text_23CB75: @ 823CB75 .string "I get so excited imagining what kinds\n" - .string "of POKéMON I’ll get to see in the next\l" + .string "of POKéMON I'll get to see in the next\l" .string "CONTEST. The anticipation of it thrills!$" SSTidalRooms_Text_23CBEB: @ 823CBEB @@ -101,43 +101,43 @@ SSTidalRooms_Text_23CC8A: @ 823CC8A SSTidalRooms_Text_23CCBB: @ 823CCBB .string "To be never ruffled in any situation is\n" - .string "the GENTLEMAN’s code of conduct.$" + .string "the GENTLEMAN's code of conduct.$" SSTidalRooms_Text_23CD04: @ 823CD04 .string "JED: I feel a little shy about this, but…\n" - .string "We’ll show you our lovey-dovey power!$" + .string "We'll show you our lovey-dovey power!$" SSTidalRooms_Text_23CD54: @ 823CD54 .string "JED: Sigh…$" SSTidalRooms_Text_23CD5F: @ 823CD5F - .string "JED: It’s the first time that our lovey-\n" - .string "dovey power couldn’t prevail!\l" + .string "JED: It's the first time that our lovey-\n" + .string "dovey power couldn't prevail!\l" .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_23CDC6: @ 823CDC6 .string "JED: You only have one POKéMON?\n" - .string "Isn’t that just too lonesome?$" + .string "Isn't that just too lonesome?$" SSTidalRooms_Text_23CE04: @ 823CE04 .string "LEA: I feel a little silly, but…\n" - .string "We’ll show you our lovey-dovey power!$" + .string "We'll show you our lovey-dovey power!$" SSTidalRooms_Text_23CE4B: @ 823CE4B .string "LEA: Oh, boo!$" SSTidalRooms_Text_23CE59: @ 823CE59 - .string "LEA: I can’t believe it!\n" + .string "LEA: I can't believe it!\n" .string "Our lovey-dovey power failed…\l" .string "You must be an awesome TRAINER!$" SSTidalRooms_Text_23CEB0: @ 823CEB0 .string "LEA: I wanted to battle…\n" - .string "But you don’t even have two POKéMON…$" + .string "But you don't even have two POKéMON…$" SSTidalRooms_Text_23CEEE: @ 823CEEE - .string "Ah, you’ve come just in time.\p" - .string "I’m bored, you see.\n" + .string "Ah, you've come just in time.\p" + .string "I'm bored, you see.\n" .string "You may entertain me.$" SSTidalRooms_Text_23CF36: @ 823CF36 @@ -149,13 +149,13 @@ SSTidalRooms_Text_23CF45: @ 823CF45 .string "A yacht for me and POKéMON!$" SSTidalRooms_Text_23CF97: @ 823CF97 - .string "Oh, you’re such an adorable TRAINER.\n" + .string "Oh, you're such an adorable TRAINER.\n" .string "Would you like to have tea?\l" .string "Or would you rather battle?$" SSTidalRooms_Text_23CFF4: @ 823CFF4 .string "I see.\n" - .string "You’re the active sort.$" + .string "You're the active sort.$" SSTidalRooms_Text_23D013: @ 823D013 .string "A world cruise on a luxury liner has its\n" @@ -164,11 +164,11 @@ SSTidalRooms_Text_23D013: @ 823D013 .string "side to touring HOENN by ferry.$" SSTidalRooms_Text_23D098: @ 823D098 - .string "Uh… Hi! I… I’m not acting suspicious!\n" + .string "Uh… Hi! I… I'm not acting suspicious!\n" .string "Uh… You can have this! For free!\p" - .string "It… Honestly, I didn’t SNATCH it from\n" - .string "someone! I’d never do such a thing!\l" - .string "It’s clean! You can use it!$" + .string "It… Honestly, I didn't SNATCH it from\n" + .string "someone! I'd never do such a thing!\l" + .string "It's clean! You can use it!$" SSTidalRooms_Text_23D145: @ 823D145 .string "SNATCH steals the beneficial effects\n" diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index a96b6b95d..d98fdca88 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -2,10 +2,10 @@ SafariZone_North_MapScripts:: @ 823D253 .byte 0 SafariZone_North_EventScript_23D254:: @ 823D254 - msgbox SafariZone_North_Text_2A5489, 2 + msgbox SafariZone_North_Text_2A5489, MSGBOX_NPC end SafariZone_North_EventScript_23D25D:: @ 823D25D - msgbox SafariZone_North_Text_2A54F0, 2 + msgbox SafariZone_North_Text_2A54F0, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc index 34e510237..a64c142fe 100644 --- a/data/maps/SafariZone_Northwest/scripts.inc +++ b/data/maps/SafariZone_Northwest/scripts.inc @@ -2,6 +2,6 @@ SafariZone_Northwest_MapScripts:: @ 823D249 .byte 0 SafariZone_Northwest_EventScript_23D24A:: @ 823D24A - msgbox SafariZone_Northwest_Text_2A542C, 2 + msgbox SafariZone_Northwest_Text_2A542C, MSGBOX_NPC end diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc index 22657eeb1..e08cfe3da 100644 --- a/data/maps/SafariZone_RestHouse/scripts.inc +++ b/data/maps/SafariZone_RestHouse/scripts.inc @@ -2,14 +2,14 @@ SafariZone_RestHouse_MapScripts:: @ 8242BE6 .byte 0 SafariZone_RestHouse_EventScript_242BE7:: @ 8242BE7 - msgbox SafariZone_RestHouse_Text_2A5639, 2 + msgbox SafariZone_RestHouse_Text_2A5639, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF0:: @ 8242BF0 - msgbox SafariZone_RestHouse_Text_2A56E1, 2 + msgbox SafariZone_RestHouse_Text_2A56E1, MSGBOX_NPC end SafariZone_RestHouse_EventScript_242BF9:: @ 8242BF9 - msgbox SafariZone_RestHouse_Text_2A5764, 2 + msgbox SafariZone_RestHouse_Text_2A5764, MSGBOX_NPC end diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 19f51b873..6579b6571 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -37,15 +37,15 @@ SafariZone_South_Movement_23D2C7: @ 823D2C7 step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA - msgbox SafariZone_South_Text_2A52EF, 2 + msgbox SafariZone_South_Text_2A52EF, MSGBOX_NPC end SafariZone_South_EventScript_23D2D3:: @ 823D2D3 - msgbox SafariZone_South_Text_2A533B, 2 + msgbox SafariZone_South_Text_2A533B, MSGBOX_NPC end SafariZone_South_EventScript_23D2DC:: @ 823D2DC - msgbox SafariZone_South_Text_2A553E, 2 + msgbox SafariZone_South_Text_2A553E, MSGBOX_NPC end SafariZone_South_EventScript_23D2E5:: @ 823D2E5 @@ -53,21 +53,21 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 faceplayer checkflag FLAG_0x05D goto_if 0, SafariZone_South_EventScript_23D30D - msgbox SafariZone_South_Text_2A51D4, 5 + msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SafariZone_South_EventScript_23D31A - msgbox SafariZone_South_Text_2A521A, 4 + msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D30D:: @ 823D30D setflag FLAG_0x05D - msgbox SafariZone_South_Text_2A52AB, 4 + msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT release end SafariZone_South_EventScript_23D31A:: @ 823D31A - msgbox SafariZone_South_Text_2A5248, 4 + msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT closemessage switch VAR_FACING case 2, SafariZone_South_EventScript_23D33F @@ -117,38 +117,38 @@ SafariZone_South_Movement_23D38D: @ 823D38D step_end SafariZone_South_EventScript_23D390:: @ 823D390 - msgbox SafariZone_South_Text_2A57EE, 2 + msgbox SafariZone_South_Text_2A57EE, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D399:: @ 823D399 - msgbox SafariZone_Southeast_Text_2A582D, 2 + msgbox SafariZone_Southeast_Text_2A582D, MSGBOX_NPC end SafariZone_South_EventScript_23D3A2:: @ 823D3A2 - msgbox SafariZone_South_Text_2A5887, 2 + msgbox SafariZone_South_Text_2A5887, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3AB:: @ 823D3AB - msgbox SafariZone_Southeast_Text_2A58C6, 2 + msgbox SafariZone_Southeast_Text_2A58C6, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3B4:: @ 823D3B4 - msgbox SafariZone_Southeast_Text_2A58FD, 2 + msgbox SafariZone_Southeast_Text_2A58FD, MSGBOX_NPC end SafariZone_Southeast_EventScript_23D3BD:: @ 823D3BD - msgbox SafariZone_Southeast_Text_2A5960, 2 + msgbox SafariZone_Southeast_Text_2A5960, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3C6:: @ 823D3C6 - msgbox SafariZone_Northeast_Text_2A59A4, 2 + msgbox SafariZone_Northeast_Text_2A59A4, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF - msgbox SafariZone_Northeast_Text_2A5A09, 2 + msgbox SafariZone_Northeast_Text_2A5A09, MSGBOX_NPC end SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 - msgbox SafariZone_Northeast_Text_2A5A44, 2 + msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc index d2e75eb1b..069f22b49 100644 --- a/data/maps/SafariZone_Southwest/scripts.inc +++ b/data/maps/SafariZone_Southwest/scripts.inc @@ -2,10 +2,10 @@ SafariZone_Southwest_MapScripts:: @ 823D266 .byte 0 SafariZone_Southwest_EventScript_23D267:: @ 823D267 - msgbox SafariZone_Southwest_Text_2A53B7, 2 + msgbox SafariZone_Southwest_Text_2A53B7, MSGBOX_NPC end SafariZone_Southwest_EventScript_23D270:: @ 823D270 - msgbox SafariZone_Southwest_Text_2A5613, 3 + msgbox SafariZone_Southwest_Text_2A5613, MSGBOX_SIGN end diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc index 9eb71d5e3..cb41b7ca6 100644 --- a/data/maps/SeafloorCavern_Entrance/scripts.inc +++ b/data/maps/SeafloorCavern_Entrance/scripts.inc @@ -27,7 +27,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485 delay 30 setvar VAR_0x40D9, 1 moveobjectoffscreen 1 - msgbox SeafloorCavern_Entrance_Text_234544, 4 + msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 @@ -41,7 +41,7 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED call_if 1, SeafloorCavern_Entrance_EventScript_234523 compare VAR_FACING, 2 call_if 1, SeafloorCavern_Entrance_EventScript_234539 - msgbox SeafloorCavern_Entrance_Text_2346C8, 4 + msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT closemessage applymovement 1, SeafloorCavern_Entrance_Movement_2725A6 waitmovement 0 @@ -66,28 +66,28 @@ SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 SeafloorCavern_Entrance_Text_234544: @ 8234544 .string "Hey!\n" .string "I remember your face!\p" - .string "If you’re here, it must mean that\n" - .string "you’re about to mess with us again!\p" + .string "If you're here, it must mean that\n" + .string "you're about to mess with us again!\p" .string "A punk like you, do you really think\n" .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" + .string "I'd say you're too early by about\n" .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" + .string "You're a perfect fit for the likes of\n" .string "TEAM MAGMA!\p" .string "Speaking of TEAM MAGMA, I hear they\n" .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" + .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" SeafloorCavern_Entrance_Text_2346C8: @ 82346C8 .string "A punk like you, do you really think\n" .string "you can take on TEAM AQUA?\p" - .string "I’d say you’re too early by about\n" + .string "I'd say you're too early by about\n" .string "a trillion years!\p" - .string "You’re a perfect fit for the likes of\n" + .string "You're a perfect fit for the likes of\n" .string "TEAM MAGMA!\p" .string "Speaking of TEAM MAGMA, I hear they\n" .string "were spotted near MOSSDEEP.\p" - .string "That bunch of goons, they sure don’t\n" + .string "That bunch of goons, they sure don't\n" .string "look good near the sea!$" diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index d3308fca2..92049e8ef 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -2,17 +2,17 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle 0, TRAINER_GRUNT_5, 0, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, 6 + trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A + msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle 0, TRAINER_GRUNT_6, 0, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, 6 + trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD + msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE end SeafloorCavern_Room1_Text_23481A: @ 823481A - .string "We don’t need a kid around!\n" + .string "We don't need a kid around!\n" .string "Go on home already!$" SeafloorCavern_Room1_Text_23484A: @ 823484A @@ -23,14 +23,14 @@ SeafloorCavern_Room1_Text_23485D: @ 823485D .string "boss around the GRUNTS…$" SeafloorCavern_Room1_Text_234898: @ 8234898 - .string "That submarine… It’s tiny inside.\n" - .string "I’m sore all over!$" + .string "That submarine… It's tiny inside.\n" + .string "I'm sore all over!$" SeafloorCavern_Room1_Text_2348CD: @ 82348CD .string "Losing makes me sore!$" SeafloorCavern_Room1_Text_2348E3: @ 82348E3 .string "That submarine we jacked, man,\n" - .string "it’s brutal as a ride.\l" - .string "It’s way too tight in there!$" + .string "it's brutal as a ride.\l" + .string "It's way too tight in there!$" diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index f57d58e22..40913f407 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -2,13 +2,13 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle 0, TRAINER_SHELLY_2, 0, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, 6 + trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 + msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle 0, TRAINER_GRUNT_27, 0, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, 6 + trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE + msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE end SeafloorCavern_Room3_Text_234966: @ 8234966 @@ -16,11 +16,11 @@ SeafloorCavern_Room3_Text_234966: @ 8234966 .string "How did you manage to get here without\n" .string "a submarine?\l" .string "What an impressive child!\p" - .string "But… It won’t do to have you\n" + .string "But… It won't do to have you\n" .string "meddling about here.\p" .string "And, I do want payback for what\n" .string "happened at the WEATHER INSTITUTE…\p" - .string "I’m going to give you a little taste\n" + .string "I'm going to give you a little taste\n" .string "of pain! Resign yourself to it!$" SeafloorCavern_Room3_Text_234A79: @ 8234A79 @@ -29,8 +29,8 @@ SeafloorCavern_Room3_Text_234A79: @ 8234A79 SeafloorCavern_Room3_Text_234A8A: @ 8234A8A .string "Ahahahaha!\n" - .string "You’re so darn strong.\p" - .string "It’s terribly disappointing that you’re\n" + .string "You're so darn strong.\p" + .string "It's terribly disappointing that you're\n" .string "not a TEAM AQUA member.\p" .string "You could have enjoyed the fabulous\n" .string "world our BOSS has promised as\l" @@ -42,14 +42,14 @@ SeafloorCavern_Room3_Text_234B3A: @ 8234B3A .string "But meddlers like you use the power of\n" .string "POKéMON to mess with us even at\l" .string "a place like this!\p" - .string "Life just doesn’t work the way we\n" + .string "Life just doesn't work the way we\n" .string "need it to!$" SeafloorCavern_Room3_Text_234BFE: @ 8234BFE .string "Gwah!$" SeafloorCavern_Room3_Text_234C04: @ 8234C04 - .string "You know, we don’t dare question\n" + .string "You know, we don't dare question\n" .string "the motives of our leader.\p" .string "But here you are, just some punk,\n" .string "going up against our BOSS.\p" diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index e509013d6..132d24a32 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -2,13 +2,13 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle 0, TRAINER_GRUNT_7, 0, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, 6 + trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 + msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle 0, TRAINER_GRUNT_9, 0, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, 6 + trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 + msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE end SeafloorCavern_Room4_Text_234CCA: @ 8234CCA @@ -19,12 +19,12 @@ SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 .string "Lost it…$" SeafloorCavern_Room4_Text_234CFC: @ 8234CFC - .string "I can’t find the way out!\p" - .string "I’m not afraid. Don’t get me wrong!$" + .string "I can't find the way out!\p" + .string "I'm not afraid. Don't get me wrong!$" SeafloorCavern_Room4_Text_234D3A: @ 8234D3A .string "Who are you?\n" - .string "Where do you think you’re going?$" + .string "Where do you think you're going?$" SeafloorCavern_Room4_Text_234D68: @ 8234D68 .string "I failed to win!$" @@ -32,5 +32,5 @@ SeafloorCavern_Room4_Text_234D68: @ 8234D68 SeafloorCavern_Room4_Text_234D79: @ 8234D79 .string "My partner forgot the map in that\n" .string "submarine!\p" - .string "How’s that for being useless?$" + .string "How's that for being useless?$" diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 8761e4bfe..9406fcb6c 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -12,27 +12,27 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 applymovement 255, SeafloorCavern_Room9_Movement_23505C waitmovement 0 playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, 4 + msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, 4 + msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A6 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, 4 + msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259E waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, 4 - trainerbattle 3, TRAINER_ARCHIE, 0, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, 4 + msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC + msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT setweather 0 doweather special sub_80B05B4 waitstate - msgbox SeafloorCavern_Room9_Text_235279, 4 + msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT special WaitWeather waitstate setvar VAR_RESULT, 1 @@ -80,21 +80,21 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, 4 + msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT playse SE_PC_LOGIN applymovement 255, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, 4 + msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT closemessage applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, 4 + msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725AA waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, 4 + msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 addobject VAR_0x8006 @@ -105,19 +105,19 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_2725A4 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, 4 + msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_272598 waitmovement 0 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_27259A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, 4 - msgbox SeafloorCavern_Room9_Text_235692, 4 + msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT closemessage applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, 4 + msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT setvar VAR_0x407B, 1 setvar VAR_0x405E, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN @@ -236,9 +236,9 @@ SeafloorCavern_Room9_Text_2350A6: @ 82350A6 .string "come…$" SeafloorCavern_Room9_Text_23512C: @ 823512C - .string "ARCHIE: It surprises me, how you’ve\n" + .string "ARCHIE: It surprises me, how you've\n" .string "managed to chase me here.\p" - .string "But that’s all over now.\p" + .string "But that's all over now.\p" .string "For the realization of my dream,\n" .string "you must disappear now!$" @@ -260,32 +260,32 @@ SeafloorCavern_Room9_Text_235279: @ 8235279 SeafloorCavern_Room9_Text_2352A7: @ 82352A7 .string "ARCHIE: What?!\p" - .string "I didn’t do anything.\n" + .string "I didn't do anything.\n" .string "Why did the RED ORB…\p" .string "Where did KYOGRE go?$" SeafloorCavern_Room9_Text_2352F6: @ 82352F6 - .string "ARCHIE: Hm? It’s a message from our\n" + .string "ARCHIE: Hm? It's a message from our\n" .string "members outside…$" SeafloorCavern_Room9_Text_23532B: @ 823532B .string "ARCHIE: Yes, what is it?\p" .string "Hm…\n" - .string "It’s raining heavily?\p" + .string "It's raining heavily?\p" .string "Good… That should have happened.\n" .string "That is why we awakened KYOGRE,\l" - .string "to realize TEAM AQUA’s vision of\l" + .string "to realize TEAM AQUA's vision of\l" .string "expanding the sea.\p" .string "What?!\p" - .string "It’s raining far harder than we\n" - .string "envisioned? You’re in danger?\p" - .string "That can’t be…\n" - .string "That’s just not possible…\p" + .string "It's raining far harder than we\n" + .string "envisioned? You're in danger?\p" + .string "That can't be…\n" + .string "That's just not possible…\p" .string "Hold your position and monitor\n" .string "the situation!$" SeafloorCavern_Room9_Text_23546F: @ 823546F - .string "ARCHIE: There’s something wrong…\p" + .string "ARCHIE: There's something wrong…\p" .string "The RED ORB is supposed to awaken\n" .string "and control KYOGRE…\p" .string "But… Why?\n" @@ -294,27 +294,27 @@ SeafloorCavern_Room9_Text_23546F: @ 823546F SeafloorCavern_Room9_Text_2354F0: @ 82354F0 .string "MAXIE: What have you wrought?\p" - .string "ARCHIE… You’ve finally awoken KYOGRE,\n" - .string "haven’t you?\p" + .string "ARCHIE… You've finally awoken KYOGRE,\n" + .string "haven't you?\p" .string "What will happen to the world if this\n" .string "downpour continues for all eternity?\p" - .string "The world’s landmass will drown in\n" + .string "The world's landmass will drown in\n" .string "the deepening sea…$" SeafloorCavern_Room9_Text_2355C2: @ 82355C2 .string "ARCHIE: W-what?!\n" - .string "Don’t get all high and mighty with me!\p" - .string "Wasn’t it you, TEAM MAGMA, that\n" + .string "Don't get all high and mighty with me!\p" + .string "Wasn't it you, TEAM MAGMA, that\n" .string "infuriated GROUDON?\p" .string "So long as I have this RED ORB,\n" .string "I should be able to control KYOGRE…\p" .string "I should be able to control it…$" SeafloorCavern_Room9_Text_235692: @ 8235692 - .string "MAXIE: We don’t have the time to\n" + .string "MAXIE: We don't have the time to\n" .string "argue about it here!\p" .string "Get outside and see for yourself!\p" - .string "See if what you’ve wrought is the\n" + .string "See if what you've wrought is the\n" .string "world that we desired!$" SeafloorCavern_Room9_Text_235723: @ 8235723 diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 9cd3727bb..a906d338e 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -28,7 +28,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 waitstate playse SE_DOOR delay 40 - msgbox gUnknown_0827301B, 4 + msgbox gUnknown_0827301B, MSGBOX_DEFAULT closemessage fadeinbgm 0 setflag FLAG_0x0E4 diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index e9e79d1e9..7d3e32479 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -118,7 +118,7 @@ SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0 end SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3 - msgbox gUnknown_0827304E, 4 + msgbox gUnknown_0827304E, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 14d5ba0fa..7d63928ab 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -28,7 +28,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 checkitem ITEM_SHOAL_SHELL, 4 compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, 5 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF checkitemspace ITEM_SHELL_BELL, 1 @@ -36,13 +36,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_236E69 compare VAR_RESULT, 2 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_272054 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT setflag FLAG_TEMP_2 release end @@ -64,7 +64,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B return ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT release end @@ -75,17 +75,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B checkitem ITEM_SHOAL_SHELL, 1 compare VAR_RESULT, 1 goto_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5 - msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT release end ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF - msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, 4 + msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 94505a96d..a92e84e3a 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA end ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC - msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT releaseall end @@ -139,7 +139,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C end ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE - msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 9883bf3da..fc0fb32a7 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 end ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 - msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end @@ -38,7 +38,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 faceplayer checkflag FLAG_0x11B goto_eq ShoalCave_LowTideLowerRoom_EventScript_2371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 goto_eq ShoalCave_LowTideLowerRoom_EventScript_272054 @@ -47,7 +47,7 @@ ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 end ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1 - msgbox ShoalCave_LowTideLowerRoom_Text_23728D, 4 + msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index e8c87bd98..de2faf65b 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -29,7 +29,7 @@ ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A end ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C - msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, 4 + msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c852e3484..1b2a1e4c9 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -40,7 +40,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 waitmovement 0 applymovement 255, SkyPillar_Outside_Movement_2725A4 waitmovement 0 - msgbox SkyPillar_Outside_Text_239416, 4 + msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT closemessage delay 30 setvar VAR_0x8004, 1 @@ -50,7 +50,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special sub_8139560 waitstate delay 40 - msgbox SkyPillar_Outside_Text_2394BC, 4 + msgbox SkyPillar_Outside_Text_2394BC, MSGBOX_DEFAULT closemessage applymovement 255, SkyPillar_Outside_Movement_2393EB applymovement 1, SkyPillar_Outside_Movement_2393DE @@ -71,7 +71,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 applymovement 1, SkyPillar_Outside_Movement_2725AA waitmovement 0 delay 30 - msgbox SkyPillar_Outside_Text_23950C, 4 + msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT closemessage setflag FLAG_SYS_WEATHER_CTRL setweather 15 @@ -79,7 +79,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 special WaitWeather waitstate delay 30 - msgbox SkyPillar_Outside_Text_23953A, 4 + msgbox SkyPillar_Outside_Text_23953A, MSGBOX_DEFAULT closemessage playse SE_KAIDAN fadescreenswapbuffers 1 @@ -138,37 +138,37 @@ SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 end SkyPillar_Outside_EventScript_2393F9:: @ 82393F9 - msgbox SkyPillar_Outside_Text_239402, 3 + msgbox SkyPillar_Outside_Text_239402, MSGBOX_SIGN end SkyPillar_Outside_Text_239402: @ 8239402 .string "The door is closed.$" SkyPillar_Outside_Text_239416: @ 8239416 - .string "WALLACE: Oh, my, I’m terribly sorry!\p" - .string "In my haste, I didn’t notice that\n" - .string "I’d left you behind!\p" - .string "I’ve opened the locked door of\n" + .string "WALLACE: Oh, my, I'm terribly sorry!\p" + .string "In my haste, I didn't notice that\n" + .string "I'd left you behind!\p" + .string "I've opened the locked door of\n" .string "the SKY PILLAR.\p" - .string "{PLAYER}{KUN}, let’s be on our way!$" + .string "{PLAYER}{KUN}, let's be on our way!$" SkyPillar_Outside_Text_2394BC: @ 82394BC - .string "WALLACE: It’s an earthquake!\p" - .string "There’s not a moment to waste!\n" - .string "We’ve got to hurry!$" + .string "WALLACE: It's an earthquake!\p" + .string "There's not a moment to waste!\n" + .string "We've got to hurry!$" SkyPillar_Outside_Text_23950C: @ 823950C .string "WALLACE: Hmm…\n" .string "The situation is getting worse…$" SkyPillar_Outside_Text_23953A: @ 823953A - .string "WALLACE: This isn’t good…\p" + .string "WALLACE: This isn't good…\p" .string "The weather distortion is spreading\n" .string "even here…\p" .string "{PLAYER}{KUN}.\p" .string "RAYQUAZA should be farther up\n" .string "from here.\p" - .string "I’m worried about SOOTOPOLIS.\n" - .string "I’ve got to go back.\p" + .string "I'm worried about SOOTOPOLIS.\n" + .string "I've got to go back.\p" .string "Everything is in your hands now.\n" - .string "Don’t fail us!$" + .string "Don't fail us!$" diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index a0ae3eb24..ef0419cdb 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -89,7 +89,7 @@ SkyPillar_Top_EventScript_239785:: @ 8239785 removeobject VAR_LAST_TALKED fadescreenswapbuffers 0 bufferspeciesname 0, VAR_0x8004 - msgbox gUnknown_08273204, 4 + msgbox gUnknown_08273204, MSGBOX_DEFAULT releaseall end @@ -124,7 +124,7 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A applymovement 1, SkyPillar_Top_Movement_23984B waitmovement 0 removeobject 1 - msgbox SkyPillar_Top_Text_239860, 4 + msgbox SkyPillar_Top_Text_239860, MSGBOX_DEFAULT closemessage delay 20 fadeinbgm 1 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 588a37636..dc3a81650 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -59,24 +59,24 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C applymovement 255, SlateportCity_Movement_1DCDA8 applymovement 35, SlateportCity_Movement_1DCDAC waitmovement 0 - msgbox SlateportCity_Text_1DF032, 4 + msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_2725A4 waitmovement 0 delay 60 - msgbox SlateportCity_Text_1DF0FE, 4 + msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT applymovement 35, SlateportCity_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_Text_1DF12B, 4 + msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SlateportCity_Text_1DF1A6, 4 + msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_0x0D7 - msgbox SlateportCity_Text_1DF1D3, 4 + msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_1DCDB4 waitmovement 0 @@ -122,7 +122,7 @@ SlateportCity_EventScript_1DCDBD:: @ 81DCDBD message SlateportCity_Text_1DD64A waitmessage pokemart SlateportCity_Pokemart_1DCDD4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -141,29 +141,29 @@ SlateportCity_EventScript_1DCDE4:: @ 81DCDE4 lock faceplayer bufferleadmonspeciesname 0 - msgbox SlateportCity_Text_1DD68A, 4 + msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT specialvar VAR_RESULT, LeadMonHasEffortRibbon compare VAR_RESULT, 1 call_if 1, SlateportCity_EventScript_1DCE38 specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut compare VAR_RESULT, 0 call_if 1, SlateportCity_EventScript_1DCE2E - msgbox SlateportCity_Text_1DD697, 4 + msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT playfanfare MUS_FANFA4 message SlateportCity_Text_1DD6E3 waitfanfare - msgbox SlateportCity_Text_1DD702, 4 + msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT special GiveLeadMonEffortRibbon release end SlateportCity_EventScript_1DCE2E:: @ 81DCE2E - msgbox SlateportCity_Text_1DD722, 4 + msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE38:: @ 81DCE38 - msgbox SlateportCity_Text_1DD77B, 4 + msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT release end @@ -172,12 +172,12 @@ SlateportCity_EventScript_1DCE42:: @ 81DCE42 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE59 - msgbox SlateportCity_Text_1DD81A, 4 + msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE59:: @ 81DCE59 - msgbox SlateportCity_Text_1DE3E2, 4 + msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT release end @@ -186,12 +186,12 @@ SlateportCity_EventScript_1DCE63:: @ 81DCE63 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCE7A - msgbox SlateportCity_Text_1DD8A6, 4 + msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCE7A:: @ 81DCE7A - msgbox SlateportCity_Text_1DE28E, 4 + msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT release end @@ -202,17 +202,17 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 call_if 1, SlateportCity_EventScript_1DCEA4 checkflag FLAG_0x060 goto_eq SlateportCity_EventScript_1DCEAE - msgbox SlateportCity_Text_1DD93D, 4 + msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEA4:: @ 81DCEA4 - msgbox SlateportCity_Text_1DE30C, 4 + msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCEAE:: @ 81DCEAE - msgbox SlateportCity_Text_1DD999, 4 + msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT release end @@ -221,23 +221,23 @@ SlateportCity_EventScript_1DCEB8:: @ 81DCEB8 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCECF - msgbox SlateportCity_Text_1DDA34, 4 + msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCECF:: @ 81DCECF - msgbox SlateportCity_Text_1DE376, 4 + msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCED9:: @ 81DCED9 compare VAR_0x4058, 1 goto_eq SlateportCity_EventScript_1DCEED - msgbox SlateportCity_Text_1DDA9A, 2 + msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC end SlateportCity_EventScript_1DCEED:: @ 81DCEED - msgbox SlateportCity_Text_1DE43D, 3 + msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN end SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 @@ -245,12 +245,12 @@ SlateportCity_EventScript_1DCEF6:: @ 81DCEF6 faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCF0D - msgbox SlateportCity_Text_1DDB21, 4 + msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF0D:: @ 81DCF0D - msgbox SlateportCity_Text_1DE460, 4 + msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT release end @@ -259,17 +259,17 @@ SlateportCity_EventScript_1DCF17:: @ 81DCF17 faceplayer checkflag FLAG_0x094 goto_eq SlateportCity_EventScript_1DCF2C - msgbox SlateportCity_Text_1DDBAC, 4 + msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF2C:: @ 81DCF2C - msgbox SlateportCity_Text_1DDBD5, 4 + msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCF36:: @ 81DCF36 - msgbox SlateportCity_Text_1DE8BC, 3 + msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN end SlateportCity_EventScript_1DCF3F:: @ 81DCF3F @@ -278,51 +278,51 @@ SlateportCity_EventScript_1DCF3F:: @ 81DCF3F goto_eq SlateportCity_EventScript_1DCF66 checkflag FLAG_BADGE07_GET goto_eq SlateportCity_EventScript_1DCF5C - msgbox SlateportCity_Text_1DE8F8, 4 + msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF5C:: @ 81DCF5C - msgbox SlateportCity_Text_1DE940, 4 + msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF66:: @ 81DCF66 - msgbox SlateportCity_Text_1DE9AA, 4 + msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCF70:: @ 81DCF70 - msgbox SlateportCity_Text_1DEA0B, 3 + msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF79:: @ 81DCF79 - msgbox SlateportCity_Text_1DEA3B, 3 + msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN end SlateportCity_EventScript_1DCF82:: @ 81DCF82 - msgbox SlateportCity_Text_1DEA6F, 3 + msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN end SlateportCity_EventScript_1DCF8B:: @ 81DCF8B - msgbox SlateportCity_Text_1DEAAF, 3 + msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN end SlateportCity_EventScript_1DCF94:: @ 81DCF94 lockall checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_EventScript_1DCFA8 - msgbox SlateportCity_Text_1DEAE3, 4 + msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFA8:: @ 81DCFA8 - msgbox SlateportCity_Text_1DEB5A, 4 + msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT releaseall end SlateportCity_EventScript_1DCFB2:: @ 81DCFB2 - msgbox SlateportCity_Text_1DEBA0, 3 + msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN end SlateportCity_EventScript_1DCFBB:: @ 81DCFBB @@ -330,39 +330,39 @@ SlateportCity_EventScript_1DCFBB:: @ 81DCFBB faceplayer compare VAR_0x4058, 1 call_if 1, SlateportCity_EventScript_1DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFD2:: @ 81DCFD2 - msgbox SlateportCity_Text_1DE10E, 4 + msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT release end SlateportCity_EventScript_1DCFDC:: @ 81DCFDC - msgbox SlateportCity_Text_1DE16C, 2 + msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC end SlateportCity_EventScript_1DCFE5:: @ 81DCFE5 - msgbox SlateportCity_Text_1DDFF7, 2 + msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC end SlateportCity_EventScript_1DCFEE:: @ 81DCFEE - msgbox SlateportCity_Text_1DE04B, 2 + msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC end SlateportCity_EventScript_1DCFF7:: @ 81DCFF7 - msgbox SlateportCity_Text_1DE0D2, 2 + msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC end SlateportCity_EventScript_1DD000:: @ 81DD000 - msgbox SlateportCity_Text_1DE1EC, 2 + msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC end SlateportCity_EventScript_1DD009:: @ 81DD009 lock faceplayer - msgbox SlateportCity_Text_1DDC4F, 4 + msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT closemessage applymovement 5, SlateportCity_Movement_2725A2 waitmovement 0 @@ -372,7 +372,7 @@ SlateportCity_EventScript_1DD009:: @ 81DD009 SlateportCity_EventScript_1DD020:: @ 81DD020 lock faceplayer - msgbox SlateportCity_Text_1DDC8A, 4 + msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT closemessage applymovement 18, SlateportCity_Movement_2725A2 waitmovement 0 @@ -382,7 +382,7 @@ SlateportCity_EventScript_1DD020:: @ 81DD020 SlateportCity_EventScript_1DD037:: @ 81DD037 lock faceplayer - msgbox SlateportCity_Text_1DDCD5, 4 + msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT closemessage applymovement 19, SlateportCity_Movement_2725A2 waitmovement 0 @@ -392,7 +392,7 @@ SlateportCity_EventScript_1DD037:: @ 81DD037 SlateportCity_EventScript_1DD04E:: @ 81DD04E lock faceplayer - msgbox SlateportCity_Text_1DDD18, 4 + msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT closemessage applymovement 26, SlateportCity_Movement_2725A2 waitmovement 0 @@ -402,7 +402,7 @@ SlateportCity_EventScript_1DD04E:: @ 81DD04E SlateportCity_EventScript_1DD065:: @ 81DD065 lock faceplayer - msgbox SlateportCity_Text_1DDD7D, 4 + msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT closemessage applymovement 27, SlateportCity_Movement_2725A2 waitmovement 0 @@ -412,7 +412,7 @@ SlateportCity_EventScript_1DD065:: @ 81DD065 SlateportCity_EventScript_1DD07C:: @ 81DD07C lock faceplayer - msgbox SlateportCity_Text_1DDDC0, 4 + msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT closemessage applymovement 28, SlateportCity_Movement_2725A2 waitmovement 0 @@ -422,7 +422,7 @@ SlateportCity_EventScript_1DD07C:: @ 81DD07C SlateportCity_EventScript_1DD093:: @ 81DD093 lock faceplayer - msgbox SlateportCity_Text_1DDDDF, 4 + msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT closemessage applymovement 29, SlateportCity_Movement_2725A2 waitmovement 0 @@ -432,7 +432,7 @@ SlateportCity_EventScript_1DD093:: @ 81DD093 SlateportCity_EventScript_1DD0AA:: @ 81DD0AA lock faceplayer - msgbox SlateportCity_Text_1DDE2F, 4 + msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT closemessage applymovement 30, SlateportCity_Movement_2725A2 waitmovement 0 @@ -447,7 +447,7 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259A waitmovement 0 - msgbox SlateportCity_Text_1DDE6E, 4 + msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 @@ -455,13 +455,13 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 waitmovement 0 applymovement 31, SlateportCity_Movement_27259E waitmovement 0 - msgbox SlateportCity_Text_1DDE86, 4 + msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_2725A2 waitmovement 0 applymovement 31, SlateportCity_Movement_1DD147 waitmovement 0 - msgbox SlateportCity_Text_1DDEB8, 4 + msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT closemessage applymovement 31, SlateportCity_Movement_27259E waitmovement 0 @@ -478,13 +478,13 @@ SlateportCity_Movement_1DD147: @ 81DD147 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A - msgbox SlateportCity_Text_1DDF32, 3 + msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN end SlateportCity_EventScript_1DD153:: @ 81DD153 lock faceplayer - msgbox SlateportCity_Text_1DDF8D, 4 + msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT closemessage applymovement 33, SlateportCity_Movement_2725A2 waitmovement 0 @@ -497,7 +497,7 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD184 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -511,7 +511,7 @@ SlateportCity_PokemartDecor_1DD184: @ 81DD184 end SlateportCity_EventScript_1DD18E:: @ 81DD18E - msgbox gUnknown_08272E30, 4 + msgbox gUnknown_08272E30, MSGBOX_DEFAULT release end @@ -523,7 +523,7 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -552,7 +552,7 @@ SlateportCity_EventScript_1DD1D8:: @ 81DD1D8 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Pokemart_1DD1F0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -566,8 +566,8 @@ SlateportCity_Pokemart_1DD1F0: @ 81DD1F0 SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 lockall - msgbox SlateportCity_Text_1DE502, 4 - msgbox SlateportCity_Text_1DE54A, 4 + msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT closemessage applymovement 10, SlateportCity_Movement_2725A8 waitmovement 0 @@ -582,12 +582,12 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 removeobject 10 removeobject 9 - msgbox SlateportCity_Text_1DE5F7, 4 + msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE64F, 4 + msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT playbgm MUS_AQA_0, 0 - msgbox SlateportCity_Text_1DE724, 4 + msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT applymovement 6, SlateportCity_Movement_2725A4 applymovement 1, SlateportCity_Movement_2725A4 applymovement 7, SlateportCity_Movement_1DD309 @@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725AA waitmovement 0 - msgbox SlateportCity_Text_1DE7F7, 4 + msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT playse SE_PIN applymovement 11, SlateportCity_Movement_272598 waitmovement 0 @@ -604,8 +604,8 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 waitmovement 0 applymovement 11, SlateportCity_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Text_1DE860, 4 - msgbox SlateportCity_Text_1DE8A0, 4 + msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT + msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT closemessage applymovement 11, SlateportCity_Movement_1DD337 applymovement 255, SlateportCity_Movement_1DD344 @@ -714,15 +714,15 @@ SlateportCity_Movement_1DD34A: @ 81DD34A step_end SlateportCity_EventScript_1DD353:: @ 81DD353 - msgbox SlateportCity_Text_1DE491, 3 + msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN end SlateportCity_EventScript_1DD35C:: @ 81DD35C - msgbox SlateportCity_Text_1DE4C4, 3 + msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN end SlateportCity_EventScript_1DD365:: @ 81DD365 - msgbox SlateportCity_Text_1DD7AD, 2 + msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC end SlateportCity_EventScript_1DD36E:: @ 81DD36E @@ -730,10 +730,10 @@ SlateportCity_EventScript_1DD36E:: @ 81DD36E faceplayer checkflag FLAG_0x151 goto_eq SlateportCity_EventScript_1DD39A - msgbox SlateportCity_Text_1DEBCE, 4 + msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR setflag FLAG_0x151 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -742,13 +742,13 @@ SlateportCity_EventScript_1DD39A:: @ 81DD39A specialvar VAR_RESULT, sub_80246D4 compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3C0 - msgbox SlateportCity_Text_1DEE40, 4 + msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT special sub_80248B0 goto SlateportCity_EventScript_1DD3CA end SlateportCity_EventScript_1DD3C0:: @ 81DD3C0 - msgbox SlateportCity_Text_1DED27, 4 + msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -852,13 +852,13 @@ SlateportCity_EventScript_1DD536:: @ 81DD536 end SlateportCity_EventScript_1DD54A:: @ 81DD54A - msgbox SlateportCity_Text_1DEFBC, 4 + msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD557:: @ 81DD557 - msgbox SlateportCity_Text_1DEE90, 5 + msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_EventScript_1DD3CA copyvar VAR_0x8004, VAR_0x8009 @@ -871,22 +871,22 @@ SlateportCity_EventScript_1DD557:: @ 81DD557 copyvar VAR_0x8004, VAR_0x8009 special sub_802477C special sub_802488C - msgbox SlateportCity_Text_1DEEF7, 5 + msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_EventScript_1DD3CA - msgbox SlateportCity_Text_1DEF79, 4 + msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5C1:: @ 81DD5C1 - msgbox gUnknown_08272A89, 4 + msgbox gUnknown_08272A89, MSGBOX_DEFAULT special sub_8024918 release end SlateportCity_EventScript_1DD5CE:: @ 81DD5CE - msgbox SlateportCity_Text_1DEEC9, 4 + msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT goto SlateportCity_EventScript_1DD3CA end @@ -902,7 +902,7 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC waitmovement 0 closedoor 10, 12 waitdooranim - msgbox SlateportCity_Text_1DF28C, 4 + msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT closemessage applymovement 255, SlateportCity_Movement_1DD634 applymovement 35, SlateportCity_Movement_1DD63A @@ -948,7 +948,7 @@ SlateportCity_EventScript_1DD643:: @ 81DD643 end SlateportCity_Text_1DD64A: @ 81DD64A - .string "I’m the ENERGY GURU! I’ll go for it and\n" + .string "I'm the ENERGY GURU! I'll go for it and\n" .string "sell you what you need!$" SlateportCity_Text_1DD68A: @ 81DD68A @@ -969,7 +969,7 @@ SlateportCity_Text_1DD702: @ 81DD702 SlateportCity_Text_1DD722: @ 81DD722 .string "You have to go for it a little harder.\p" - .string "If you do, I’ll give your POKéMON\n" + .string "If you do, I'll give your POKéMON\n" .string "something nice.$" SlateportCity_Text_1DD77B: @ 81DD77B @@ -979,7 +979,7 @@ SlateportCity_Text_1DD77B: @ 81DD77B SlateportCity_Text_1DD7AD: @ 81DD7AD .string "The light of the lighthouse reaches\n" .string "dozens of miles away.\p" - .string "I wonder if it doesn’t startle POKéMON\n" + .string "I wonder if it doesn't startle POKéMON\n" .string "in the sea.$" SlateportCity_Text_1DD81A: @ 81DD81A @@ -1003,22 +1003,22 @@ SlateportCity_Text_1DD93D: @ 81DD93D SlateportCity_Text_1DD999: @ 81DD999 .string "If you put DOLLS or CUSHIONS on\n" - .string "the floor, they’ll get dirty.\p" - .string "I’m going to buy some BRICKS so my\n" - .string "DOLLS and CUSHIONS won’t get dirty\l" + .string "the floor, they'll get dirty.\p" + .string "I'm going to buy some BRICKS so my\n" + .string "DOLLS and CUSHIONS won't get dirty\l" .string "when I leave them out.$" SlateportCity_Text_1DDA34: @ 81DDA34 - .string "Wroooar! I’m going to compete in\n" + .string "Wroooar! I'm going to compete in\n" .string "the BATTLE TENT, too!\p" .string "But before that, I need to catch\n" .string "some POKéMON!$" SlateportCity_Text_1DDA9A: @ 81DDA9A - .string "Whew… I’m just bushed…\p" + .string "Whew… I'm just bushed…\p" .string "I hiked over from MAUVILLE CITY.\n" - .string "But, boy, this city’s huge.\p" - .string "If I’d known this, I would’ve ridden\n" + .string "But, boy, this city's huge.\p" + .string "If I'd known this, I would've ridden\n" .string "my BIKE here.$" SlateportCity_Text_1DDB21: @ 81DDB21 @@ -1039,7 +1039,7 @@ SlateportCity_Text_1DDBD5: @ 81DDBD5 SlateportCity_Text_1DDC4F: @ 81DDC4F .string "Hey, there! Quit pushing!\n" - .string "This is the line, can’t you see?$" + .string "This is the line, can't you see?$" SlateportCity_Text_1DDC8A: @ 81DDC8A .string "TEAM AQUA has a policy of\n" @@ -1052,17 +1052,17 @@ SlateportCity_Text_1DDCD5: @ 81DDCD5 .string "a MUSEUM now?$" SlateportCity_Text_1DDD18: @ 81DDD18 - .string "What’s the new scheme, I wonder?\p" - .string "Our BOSS is scary when he’s mad, so\n" - .string "I’d better not screw things up…$" + .string "What's the new scheme, I wonder?\p" + .string "Our BOSS is scary when he's mad, so\n" + .string "I'd better not screw things up…$" SlateportCity_Text_1DDD7D: @ 81DDD7D - .string "If there’s something we need in\n" + .string "If there's something we need in\n" .string "the MUSEUM, we should take it all!$" SlateportCity_Text_1DDDC0: @ 81DDDC0 .string "Hey, you there!\n" - .string "Don’t butt in!$" + .string "Don't butt in!$" SlateportCity_Text_1DDDDF: @ 81DDDDF .string "A long line, huh?\p" @@ -1079,26 +1079,26 @@ SlateportCity_Text_1DDE6E: @ 81DDE6E SlateportCity_Text_1DDE86: @ 81DDE86 .string "You want to read this sign?\n" - .string "I’ll read it for you!$" + .string "I'll read it for you!$" SlateportCity_Text_1DDEB8: @ 81DDEB8 - .string "Let’s see…\p" + .string "Let's see…\p" .string "Um… I think it says something like\n" .string "“the life in the sea is endless.”\p" - .string "Yup, I’m pretty sure that’s what\n" + .string "Yup, I'm pretty sure that's what\n" .string "it says.$" SlateportCity_Text_1DDF32: @ 81DDF32 .string "Grumble…\p" - .string "I should’ve brought my Game Boy\n" - .string "Advance so I wouldn’t get bored in line…\p" + .string "I should've brought my Game Boy\n" + .string "Advance so I wouldn't get bored in line…\p" .string "Grumble…$" SlateportCity_Text_1DDF8D: @ 81DDF8D - .string "When this operation’s over, I’ll take\n" + .string "When this operation's over, I'll take\n" .string "you to a hot spring spa!\p" - .string "That’s what our leader said.\n" - .string "I can’t wait!$" + .string "That's what our leader said.\n" + .string "I can't wait!$" SlateportCity_Text_1DDFF7: @ 81DDFF7 .string "The sea is just so vast…\p" @@ -1116,20 +1116,20 @@ SlateportCity_Text_1DE0D2: @ 81DE0D2 .string "away and buy too much.$" SlateportCity_Text_1DE10E: @ 81DE10E - .string "If you want to change your POKéMON’s\n" - .string "nickname, you’ll have to get the NAME\l" + .string "If you want to change your POKéMON's\n" + .string "nickname, you'll have to get the NAME\l" .string "RATER to help you.$" SlateportCity_Text_1DE16C: @ 81DE16C .string "Any POKéMON you get in a trade,\n" - .string "you can’t change its nickname.\p" - .string "The original TRAINER’s love for that\n" + .string "you can't change its nickname.\p" + .string "The original TRAINER's love for that\n" .string "POKéMON is in the nickname.$" SlateportCity_Text_1DE1EC: @ 81DE1EC .string "Recently, a BATTLE TENT was built\n" .string "in SLATEPORT.\p" - .string "GYMS are fun, but the BATTLE TENT’s\n" + .string "GYMS are fun, but the BATTLE TENT's\n" .string "awesome in its own way.\p" .string "You should go find tough POKéMON\n" .string "for the BATTLE TENT!$" @@ -1137,13 +1137,13 @@ SlateportCity_Text_1DE1EC: @ 81DE1EC SlateportCity_Text_1DE28E: @ 81DE28E .string "I was hoping that it was a famous star\n" .string "so I could get an autograph.\p" - .string "But who’s that being interviewed?\n" - .string "Isn’t that CAPT. STERN?$" + .string "But who's that being interviewed?\n" + .string "Isn't that CAPT. STERN?$" SlateportCity_Text_1DE30C: @ 81DE30C .string "That lady interviewer is so cool\n" .string "and pretty.\p" - .string "When I grow up, I’m going to be\n" + .string "When I grow up, I'm going to be\n" .string "an international journalist!$" SlateportCity_Text_1DE376: @ 81DE376 @@ -1153,7 +1153,7 @@ SlateportCity_Text_1DE376: @ 81DE376 .string "What could it be?$" SlateportCity_Text_1DE3E2: @ 81DE3E2 - .string "What’s going on here?\p" + .string "What's going on here?\p" .string "Did the good CAPTAIN come back with\n" .string "a big fish from the ocean floor?$" @@ -1163,14 +1163,14 @@ SlateportCity_Text_1DE43D: @ 81DE43D SlateportCity_Text_1DE460: @ 81DE460 .string "A TV interview! Here!\n" - .string "The CAPTAIN’s a celebrity!$" + .string "The CAPTAIN's a celebrity!$" SlateportCity_Text_1DE491: @ 81DE491 .string "TY: Okay, CAPT. STERN, a big smile\n" .string "for the camera!$" SlateportCity_Text_1DE4C4: @ 81DE4C4 - .string "GABBY: I see, I see. You’ve had a most\n" + .string "GABBY: I see, I see. You've had a most\n" .string "invaluable experience…$" SlateportCity_Text_1DE502: @ 81DE502 @@ -1178,7 +1178,7 @@ SlateportCity_Text_1DE502: @ 81DE502 .string "move ahead with our exploration.$" SlateportCity_Text_1DE54A: @ 81DE54A - .string "GABBY: That’s wonderful, CAPT. STERN!\n" + .string "GABBY: That's wonderful, CAPT. STERN!\n" .string "Thank you for taking the time from\l" .string "your busy schedule to talk to us.\p" .string "We hope we can interview you again\n" @@ -1191,13 +1191,13 @@ SlateportCity_Text_1DE5F7: @ 81DE5F7 SlateportCity_Text_1DE64F: @ 81DE64F .string "Oh! {PLAYER}{KUN}!\n" - .string "You’re looking great!\p" + .string "You're looking great!\p" .string "We made a huge discovery on our last\n" .string "seafloor exploration.\p" .string "We found an underwater cavern on\n" .string "ROUTE 128.\p" - .string "We think it’s the habitat of a POKéMON\n" - .string "that’s said to have been long extinct.$" + .string "We think it's the habitat of a POKéMON\n" + .string "that's said to have been long extinct.$" SlateportCity_Text_1DE724: @ 81DE724 .string "Fufufu…\n" @@ -1217,9 +1217,9 @@ SlateportCity_Text_1DE7F7: @ 81DE7F7 .string "Where did it come from?$" SlateportCity_Text_1DE860: @ 81DE860 - .string "It’s from the HARBOR!\p" + .string "It's from the HARBOR!\p" .string "The submarine!\n" - .string "They’re trying to take it!$" + .string "They're trying to take it!$" SlateportCity_Text_1DE8A0: @ 81DE8A0 .string "{PLAYER}{KUN}!\n" @@ -1230,18 +1230,18 @@ SlateportCity_Text_1DE8BC: @ 81DE8BC .string "“Find it! The ultimate POKéMON!”$" SlateportCity_Text_1DE8F8: @ 81DE8F8 - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“Wanted: A sailor capable of sailing\n" .string "in all currents.”$" SlateportCity_Text_1DE940: @ 81DE940 - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“The ferry S.S. TIDAL nears\n" .string "completion for serving the ports of\l" .string "SLATEPORT and LILYCOVE.”$" SlateportCity_Text_1DE9AA: @ 81DE9AA - .string "STERN’S SHIPYARD\p" + .string "STERN'S SHIPYARD\p" .string "“Boarding of the SLATEPORT-LILYCOVE\n" .string "ferry S.S. TIDAL is handled at the\l" .string "HARBOR.”$" @@ -1277,7 +1277,7 @@ SlateportCity_Text_1DEB5A: @ 81DEB5A .string "the ferry S.S. TIDAL.”$" SlateportCity_Text_1DEBA0: @ 81DEBA0 - .string "NAME RATER’S HOUSE\n" + .string "NAME RATER'S HOUSE\n" .string "“POKéMON nicknames rated.”$" SlateportCity_Text_1DEBCE: @ 81DEBCE @@ -1292,7 +1292,7 @@ SlateportCity_Text_1DEBCE: @ 81DEBCE .string "Did you know that?\p" .string "You seem to have an interest\n" .string "in BERRIES!\p" - .string "I’ve got something good for someone\n" + .string "I've got something good for someone\n" .string "like you.$" SlateportCity_Text_1DED27: @ 81DED27 @@ -1319,7 +1319,7 @@ SlateportCity_Text_1DEE90: @ 81DEE90 .string "BERRY POWDER for one {STR_VAR_1}?$" SlateportCity_Text_1DEEC9: @ 81DEEC9 - .string "Oh, dear. You don’t have enough\n" + .string "Oh, dear. You don't have enough\n" .string "BERRY POWDER.$" SlateportCity_Text_1DEEF7: @ 81DEEF7 @@ -1333,16 +1333,16 @@ SlateportCity_Text_1DEF79: @ 81DEF79 .string "BERRY POWDER, bring it to me, please!$" SlateportCity_Text_1DEFBC: @ 81DEFBC - .string "Come back if you’d like to trade your\n" + .string "Come back if you'd like to trade your\n" .string "BERRY POWDER for some medicine.\p" - .string "I’m always running a bazaar here.\p" + .string "I'm always running a bazaar here.\p" .string "Did you know?$" SlateportCity_Text_1DF032: @ 81DF032 .string "SCOTT: Huh?\n" - .string "I’m sure I met you somewhere before.\p" + .string "I'm sure I met you somewhere before.\p" .string "Have I introduced myself to you?\n" - .string "If not, my name’s SCOTT.\p" + .string "If not, my name's SCOTT.\p" .string "I just saw TEAM AQUA run away from\n" .string "here like they were stung.\p" .string "Let me guess--you drove them away?$" @@ -1352,9 +1352,9 @@ SlateportCity_Text_1DF0FE: @ 81DF0FE .string "Maybe, just maybe, this TRAINER…$" SlateportCity_Text_1DF12B: @ 81DF12B - .string "SCOTT: All right! I think you’re going\n" + .string "SCOTT: All right! I think you're going\n" .string "to become a good friend.\p" - .string "So, let’s register each other in our\n" + .string "So, let's register each other in our\n" .string "POKéNAVS.\p" .string "… … … … … …$" @@ -1363,20 +1363,20 @@ SlateportCity_Text_1DF1A6: @ 81DF1A6 .string "in the POKéNAV.$" SlateportCity_Text_1DF1D3: @ 81DF1D3 - .string "SCOTT: What I’d like to do is tag along\n" + .string "SCOTT: What I'd like to do is tag along\n" .string "with you, but I do want to keep an eye\l" .string "on the talents of other people, too.\p" - .string "So, I’ll be off to roam other towns\n" + .string "So, I'll be off to roam other towns\n" .string "a bit more.\p" .string "Be seeing you, {PLAYER}{KUN}!$" SlateportCity_Text_1DF28C: @ 81DF28C .string "SCOTT: Oh, hey!\n" - .string "If it isn’t {PLAYER}{KUN}!\p" - .string "{PLAYER}{KUN}, let me guess--you’re going\n" + .string "If it isn't {PLAYER}{KUN}!\p" + .string "{PLAYER}{KUN}, let me guess--you're going\n" .string "to take the BATTLE TENT challenge?\p" - .string "Yeah! That’s a good idea!\n" - .string "That’s a really great idea!\p" + .string "Yeah! That's a good idea!\n" + .string "That's a really great idea!\p" .string "After all, a tough TRAINER is\n" .string "the perfect fit for the BATTLE TENT!\p" .string "Give it your best effort!$" diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 6b63f13f8..3cff83bd8 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -51,7 +51,7 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE setvar VAR_0x8004, 4 special sub_81B99B4 lockall - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage closemessage special HealPlayerParty diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index 57df51237..7eb935bf1 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -35,14 +35,14 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65 special sub_81B9D08 setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25A1C8, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 6 special sub_81B9D08 waitstate SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB96, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_BattleTentCorridor_Movement_2725A6 waitmovement 0 @@ -62,7 +62,7 @@ SlateportCity_BattleTentCorridor_EventScript_208EEE:: @ 8208EEE special CallBattleFactoryFunction setvar VAR_0x8004, 16 special CallBattleFactoryFunction - msgbox SlateportCity_BattleTentCorridor_Text_25A22D, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25A22D, MSGBOX_DEFAULT playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -82,7 +82,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F0D:: @ 8208F0D case 2, SlateportCity_BattleTentCorridor_EventScript_208F89 SlateportCity_BattleTentCorridor_EventScript_208F5B:: @ 8208F5B - msgbox SlateportCity_BattleTentCorridor_Text_25A350, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25A350, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208F0D case 1, SlateportCity_BattleTentCorridor_EventScript_209022 @@ -100,7 +100,7 @@ SlateportCity_BattleTentCorridor_EventScript_208F89:: @ 8208F89 SlateportCity_BattleTentCorridor_EventScript_208FBB:: @ 8208FBB setvar VAR_0x8004, 8 special sub_81B9D08 - msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, 5 + msgbox SlateportCity_BattleTentCorridor_Text_25AB2E, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentCorridor_EventScript_208EB4 case 1, SlateportCity_BattleTentCorridor_EventScript_208FF1 @@ -113,7 +113,7 @@ SlateportCity_BattleTentCorridor_EventScript_208FF1:: @ 8208FF1 waitstate compare VAR_RESULT, 1 goto_eq SlateportCity_BattleTentCorridor_EventScript_208EB4 - msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, 4 + msgbox SlateportCity_BattleTentCorridor_Text_25AB6C, MSGBOX_DEFAULT goto SlateportCity_BattleTentCorridor_EventScript_208EB4 SlateportCity_BattleTentCorridor_EventScript_209014:: @ 8209014 @@ -178,100 +178,100 @@ SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B .string "Using a certain move after another\n" .string "certain kind of move sometimes gets\l" .string "you extra attention.\p" - .string "If you know what you’re doing,\n" + .string "If you know what you're doing,\n" .string "you can score big in appeal.\p" .string "Of course, your opponents might try\n" - .string "disrupting your POKéMON’s showing.$" + .string "disrupting your POKéMON's showing.$" SlateportCity_BattleTentCorridor_Text_20917A: @ 820917A - .string "My papa, he’s a CONTEST JUDGE.\p" + .string "My papa, he's a CONTEST JUDGE.\p" .string "I wonder what I should be when I\n" .string "grow up, a JUDGE or a GYM LEADER?$" SlateportCity_BattleTentCorridor_Text_2091DC: @ 82091DC - .string "Hey, man, I’m like majorly cheesed,\n" + .string "Hey, man, I'm like majorly cheesed,\n" .string "you know. Like, you know, I just\l" .string "wanted to know why my POKéMON\l" .string "never won, you know, like, hey?\p" .string "So, like, I gave the JUDGE my two\n" - .string "cents, you know, they’re free.\p" - .string "And he wouldn’t hear me out, like, hey!\n" + .string "cents, you know, they're free.\p" + .string "And he wouldn't hear me out, like, hey!\n" .string "So, like, total bummer, man!\p" .string "Hey, like, you! Zip it, you know?\n" .string "Just, you know, take this!$" SlateportCity_BattleTentCorridor_Text_209322: @ 8209322 - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" + .string "That's, like, TM41, you know?\n" + .string "Hey, it's TORMENT, you hearing me?\p" + .string "Like, it won't let the other guy\n" .string "use the same move twice in a row, see?\p" .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" + .string "I'm not laying a torment on you!$" SlateportCity_BattleTentCorridor_Text_2093ED: @ 82093ED .string "MC: Oh, my, my!\n" - .string "Now isn’t that a dandy of a POKéMON?\p" + .string "Now isn't that a dandy of a POKéMON?\p" .string "Please! Do step right up and take\n" .string "part in our splendid CONTESTS!\p" - .string "You’ll do well! I’m sure of it!\n" + .string "You'll do well! I'm sure of it!\n" .string "My eyes have never failed me!$" SlateportCity_BattleTentCorridor_Text_2094A1: @ 82094A1 .string "JUDGE: Well, hello there!\n" - .string "I see that you’re a TRAINER!\p" - .string "Then, it just wouldn’t do for you\n" + .string "I see that you're a TRAINER!\p" + .string "Then, it just wouldn't do for you\n" .string "to miss a POKéMON CONTEST!\p" .string "Get a CONTEST PASS in VERDANTURF\n" .string "CITY and enter anytime!$" SlateportCity_BattleTentCorridor_Text_20954E: @ 820954E - .string "It’s appeal time!\n" + .string "It's appeal time!\n" .string "What should I lead with?$" SlateportCity_BattleTentCorridor_Text_209579: @ 8209579 - .string "They didn’t pay much attention to\n" - .string "my POKéMON’s appeal…\p" - .string "Humph, that JUDGE, he doesn’t know\n" + .string "They didn't pay much attention to\n" + .string "my POKéMON's appeal…\p" + .string "Humph, that JUDGE, he doesn't know\n" .string "a good thing when he sees it.$" SlateportCity_BattleTentCorridor_Text_2095F1: @ 82095F1 .string "Oh, hi! You must be a serious fan to get\n" .string "this close to the action.\p" - .string "I’ll reward your enthusiasm with\n" + .string "I'll reward your enthusiasm with\n" .string "this sage advice.\p" .string "If a move goes over really well,\n" .string "the audience will get excited.\p" .string "The POKéMON that makes its appeal\n" - .string "right when everyone’s excited…\p" - .string "Well, you’d think something good has\n" + .string "right when everyone's excited…\p" + .string "Well, you'd think something good has\n" .string "to happen!$" SlateportCity_BattleTentCorridor_Text_209718: @ 8209718 - .string "I can’t do this! I’m more freaked out\n" + .string "I can't do this! I'm more freaked out\n" .string "than my POKéMON.\p" - .string "I’m shivering and my heart is racing!$" + .string "I'm shivering and my heart is racing!$" SlateportCity_BattleTentCorridor_Text_209775: @ 8209775 - .string "A battle and a CONTEST aren’t the\n" + .string "A battle and a CONTEST aren't the\n" .string "same, but they are alike, too.\p" .string "You need to work hard and believe\n" - .string "in the POKéMON you’ve raised.$" + .string "in the POKéMON you've raised.$" SlateportCity_BattleTentCorridor_Text_2097F6: @ 82097F6 - .string "That POKéMON looks like it’s on top\n" + .string "That POKéMON looks like it's on top\n" .string "of its game, huh?\p" .string "A POKéMON that does good in the\n" .string "secondary judging seems to be more\l" - .string "relaxed when it’s doing appeals.$" + .string "relaxed when it's doing appeals.$" SlateportCity_BattleTentCorridor_Text_209890: @ 8209890 .string "Will you look at that sorry sight?\p" - .string "Heh, my POKéMON’s absolutely better\n" + .string "Heh, my POKéMON's absolutely better\n" .string "than that lot!$" SlateportCity_BattleTentCorridor_Text_2098E6: @ 82098E6 - .string "Don’t you get the urge to move with\n" - .string "POKéMON if they’re putting on an\l" + .string "Don't you get the urge to move with\n" + .string "POKéMON if they're putting on an\l" .string "energetic appeal?$" SlateportCity_BattleTentCorridor_Text_20993D: @ 820993D diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 2e7886a2e..8e5c81e12 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ SlateportCity_BattleTentLobby_EventScript_208779:: @ 8208779 SlateportCity_BattleTentLobby_EventScript_208782:: @ 8208782 lockall - msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5DFA, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -58,7 +58,7 @@ SlateportCity_BattleTentLobby_EventScript_2087B7:: @ 82087B7 waitse SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 - msgbox SlateportCity_BattleTentLobby_Text_2C5D14, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D14, MSGBOX_DEFAULT setvar VAR_0x8004, 5 special sub_81B9D08 switch VAR_RESULT @@ -74,7 +74,7 @@ SlateportCity_BattleTentLobby_EventScript_2087E9:: @ 82087E9 goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_20882A:: @ 820882A - msgbox SlateportCity_BattleTentLobby_Text_2C5D52, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5D52, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208861 SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 @@ -92,7 +92,7 @@ SlateportCity_BattleTentLobby_EventScript_208837:: @ 8208837 waitse SlateportCity_BattleTentLobby_EventScript_208861:: @ 8208861 - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -123,7 +123,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA compare VAR_RESULT, 0 goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9 special SavePlayerParty - msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5810, MSGBOX_DEFAULT SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA message SlateportCity_BattleTentLobby_Text_2C586A @@ -142,7 +142,7 @@ SlateportCity_BattleTentLobby_EventScript_208906:: @ 8208906 setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox SlateportCity_BattleTentLobby_Text_2C5B06, 5 + msgbox SlateportCity_BattleTentLobby_Text_2C5B06, MSGBOX_YESNO switch VAR_RESULT case 0, SlateportCity_BattleTentLobby_EventScript_208A2B case 1, SlateportCity_BattleTentLobby_EventScript_208950 @@ -172,7 +172,7 @@ SlateportCity_BattleTentLobby_EventScript_208950:: @ 8208950 setvar VAR_0x8006, 0 SlateportCity_BattleTentLobby_EventScript_2089AC:: @ 82089AC - msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5B8C, MSGBOX_DEFAULT closemessage call SlateportCity_BattleTentLobby_EventScript_2089C9 warp MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -217,7 +217,7 @@ SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 - msgbox SlateportCity_BattleTentLobby_Text_2C589C, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C589C, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_2088CA SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14 @@ -231,7 +231,7 @@ SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B special LoadPlayerParty SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E - msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, MSGBOX_DEFAULT release end @@ -247,35 +247,35 @@ SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D faceplayer checkflag FLAG_0x109 goto_eq SlateportCity_BattleTentLobby_EventScript_208A74 - msgbox SlateportCity_BattleTentLobby_Text_208B4E, 4 + msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 goto_eq SlateportCity_BattleTentLobby_EventScript_272054 setflag FLAG_0x109 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A74:: @ 8208A74 - msgbox SlateportCity_BattleTentLobby_Text_208C5C, 4 + msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end SlateportCity_BattleTentLobby_EventScript_208A7E:: @ 8208A7E - msgbox SlateportCity_BattleTentLobby_Text_208D27, 2 + msgbox SlateportCity_BattleTentLobby_Text_208D27, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A87:: @ 8208A87 - msgbox SlateportCity_BattleTentLobby_Text_208DA6, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DA6, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A90:: @ 8208A90 - msgbox SlateportCity_BattleTentLobby_Text_208DF1, 2 + msgbox SlateportCity_BattleTentLobby_Text_208DF1, MSGBOX_NPC end SlateportCity_BattleTentLobby_EventScript_208A99:: @ 8208A99 lockall - msgbox SlateportCity_BattleTentLobby_Text_259721, 4 + msgbox SlateportCity_BattleTentLobby_Text_259721, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end @@ -294,27 +294,27 @@ SlateportCity_BattleTentLobby_EventScript_208AA8:: @ 8208AA8 end SlateportCity_BattleTentLobby_EventScript_208B06:: @ 8208B06 - msgbox SlateportCity_BattleTentLobby_Text_2C5F08, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F08, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B14:: @ 8208B14 - msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C5F9D, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B22:: @ 8208B22 - msgbox SlateportCity_BattleTentLobby_Text_2C6020, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C6020, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B30:: @ 8208B30 - msgbox SlateportCity_BattleTentLobby_Text_2C60C0, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C60C0, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end SlateportCity_BattleTentLobby_EventScript_208B3E:: @ 8208B3E - msgbox SlateportCity_BattleTentLobby_Text_2C61FE, 4 + msgbox SlateportCity_BattleTentLobby_Text_2C61FE, MSGBOX_DEFAULT goto SlateportCity_BattleTentLobby_EventScript_208AA8 end @@ -323,35 +323,35 @@ SlateportCity_BattleTentLobby_EventScript_208B4C:: @ 8208B4C end SlateportCity_BattleTentLobby_Text_208B4E: @ 8208B4E - .string "So, like, I couldn’t find myself any\n" + .string "So, like, I couldn't find myself any\n" .string "POKéMON that were, like, for me.\p" .string "So, I figured, like, hey, I should file\n" .string "a complaint to the guy there?\p" - .string "And he wouldn’t hear me out, like, hey!\n" + .string "And he wouldn't hear me out, like, hey!\n" .string "So, like, total bummer, man!\p" .string "Hey, like, you! Zip it, you know?\n" .string "Just, you know, take this!$" SlateportCity_BattleTentLobby_Text_208C5C: @ 8208C5C - .string "That’s, like, TM41, you know?\n" - .string "Hey, it’s TORMENT, you hearing me?\p" - .string "Like, it won’t let the other guy\n" + .string "That's, like, TM41, you know?\n" + .string "Hey, it's TORMENT, you hearing me?\p" + .string "Like, it won't let the other guy\n" .string "use the same move twice in a row, see?\p" .string "Hey, now, you listen here, like,\n" - .string "I’m not laying a torment on you!$" + .string "I'm not laying a torment on you!$" SlateportCity_BattleTentLobby_Text_208D27: @ 8208D27 - .string "I don’t really like BUG POKéMON,\n" - .string "but maybe I’ll try using some for\l" + .string "I don't really like BUG POKéMON,\n" + .string "but maybe I'll try using some for\l" .string "a change of pace.\p" .string "Who knows, I might even get to like\n" .string "them!$" SlateportCity_BattleTentLobby_Text_208DA6: @ 8208DA6 .string "You can battle all you want here even\n" - .string "if you don’t have any tough POKéMON.$" + .string "if you don't have any tough POKéMON.$" SlateportCity_BattleTentLobby_Text_208DF1: @ 8208DF1 - .string "Wouldn’t it be nice if they had more of\n" + .string "Wouldn't it be nice if they had more of\n" .string "a selection?$" diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 20e6b78ed..efc0ff565 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 applymovement 6, SlateportCity_Harbor_Movement_2725AA applymovement 255, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_Harbor_Text_20D291, 4 + msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT closemessage applymovement 6, SlateportCity_Harbor_Movement_20CAC8 applymovement 7, SlateportCity_Harbor_Movement_20CAC8 @@ -74,7 +74,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 compare VAR_0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_20CAB3 - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT closemessage setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE @@ -164,12 +164,12 @@ SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 faceplayer checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CB06 - msgbox SlateportCity_Harbor_Text_20CE20, 4 + msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 - msgbox SlateportCity_Harbor_Text_20CE87, 4 + msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT message SlateportCity_Harbor_Text_20CF1C waitmessage goto SlateportCity_Harbor_EventScript_20CB1A @@ -195,12 +195,12 @@ SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50 end SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88 - msgbox SlateportCity_Harbor_Text_20CEC1, 4 + msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 - msgbox SlateportCity_Harbor_Text_20CF93, 5 + msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD setvar VAR_PORTHOLE_STATE, 1 @@ -211,7 +211,7 @@ SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92 end SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA - msgbox SlateportCity_Harbor_Text_20CFAE, 5 + msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CBDD call SlateportCity_Harbor_EventScript_20CBE9 @@ -227,7 +227,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD end SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 - msgbox SlateportCity_Harbor_Text_20CFCB, 4 + msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A6 waitmovement 0 @@ -244,7 +244,7 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 return SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D - msgbox SlateportCity_Harbor_Text_20CF71, 4 + msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT release end @@ -279,12 +279,12 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 call_if 1, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 goto_eq SlateportCity_Harbor_EventScript_20CC89 - msgbox SlateportCity_Harbor_Text_20D08E, 4 + msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89 - msgbox SlateportCity_Harbor_Text_20D01C, 4 + msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT release end @@ -293,7 +293,7 @@ SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93 return SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99 - msgbox SlateportCity_Harbor_Text_20D194, 2 + msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC end SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 @@ -307,7 +307,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 goto_eq SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 goto_eq SlateportCity_Harbor_EventScript_20CCDF - msgbox SlateportCity_Harbor_Text_20D232, 4 + msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_2725A2 waitmovement 0 @@ -315,18 +315,18 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 end SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF - msgbox SlateportCity_Harbor_Text_20D35A, 4 + msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 setflag FLAG_0x10F - msgbox SlateportCity_Harbor_Text_20D42B, 4 + msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6 - msgbox SlateportCity_Harbor_Text_20D58A, 4 + msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT release end @@ -338,12 +338,12 @@ SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00 goto_eq SlateportCity_Harbor_EventScript_20CD38 checkflag FLAG_SYS_GAME_CLEAR goto_eq SlateportCity_Harbor_EventScript_20CD2E - msgbox SlateportCity_Harbor_Text_20D65C, 4 + msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT release end SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E - msgbox SlateportCity_Harbor_Text_20D6CB, 4 + msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT release end @@ -363,33 +363,33 @@ SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44 end SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B - msgbox SlateportCity_Harbor_Text_20D8BC, 5 + msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_TOOTH compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB - msgbox SlateportCity_Harbor_Text_20D8F1, 5 + msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_20CE05 giveitem_std ITEM_DEEP_SEA_SCALE compare VAR_RESULT, 0 goto_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 - msgbox SlateportCity_Harbor_Text_20D94A, 4 + msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT setflag FLAG_TRADED_SCANNER_TO_STERN goto SlateportCity_Harbor_EventScript_20CE11 end SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB - msgbox SlateportCity_Harbor_Text_20D841, 4 + msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT release end @@ -401,14 +401,14 @@ SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05 SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11 setvar VAR_TEMP_1, 1 - msgbox SlateportCity_Harbor_Text_20D970, 4 + msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT release end SlateportCity_Harbor_Text_20CE20: @ 820CE20 .string "I beg your pardon?\n" - .string "You’re looking for a ship?\p" - .string "I’m sorry, the ferry service isn’t\n" + .string "You're looking for a ship?\p" + .string "I'm sorry, the ferry service isn't\n" .string "available at present…$" SlateportCity_Harbor_Text_20CE87: @ 820CE87 @@ -417,14 +417,14 @@ SlateportCity_Harbor_Text_20CE87: @ 820CE87 SlateportCity_Harbor_Text_20CEC1: @ 820CEC1 - .string "{PLAYER} doesn’t have the TICKET…\p" - .string "I’m terribly sorry.\p" + .string "{PLAYER} doesn't have the TICKET…\p" + .string "I'm terribly sorry.\p" .string "You must have a TICKET to board\n" .string "the ferry.$" SlateportCity_Harbor_Text_20CF1C: @ 820CF1C .string "{PLAYER} flashed the TICKET.\p" - .string "Perfect! That’s all you need!\p" + .string "Perfect! That's all you need!\p" .string "And where would you like to go?$" SlateportCity_Harbor_Text_20CF71: @ 820CF71 @@ -445,8 +445,8 @@ SlateportCity_Harbor_Text_20CFFA: @ 820CFFA SlateportCity_Harbor_Text_20D01C: @ 820D01C .string "A journey to the bottom of the sea…\n" - .string "I wonder what it’d be like?\p" - .string "I’d love to go deep underwater like\n" + .string "I wonder what it'd be like?\p" + .string "I'd love to go deep underwater like\n" .string "that someday.$" SlateportCity_Harbor_Text_20D08E: @ 820D08E @@ -462,13 +462,13 @@ SlateportCity_Harbor_Text_20D08E: @ 820D08E SlateportCity_Harbor_Text_20D194: @ 820D194 .string "I wanted to go with CAPT. STERN on\n" .string "the ocean floor exploration.\p" - .string "But the sub’s too small for me.\p" - .string "If I squeezed in, there wouldn’t be\n" + .string "But the sub's too small for me.\p" + .string "If I squeezed in, there wouldn't be\n" .string "any room for the CAPTAIN…$" SlateportCity_Harbor_Text_20D232: @ 820D232 .string "CAPT. STERN: Those thugs…\p" - .string "They’re the same lot who tried to rob\n" + .string "They're the same lot who tried to rob\n" .string "the DEVON GOODS at the MUSEUM.$" SlateportCity_Harbor_Text_20D291: @ 820D291 @@ -486,19 +486,19 @@ SlateportCity_Harbor_Text_20D35A: @ 820D35A .string "CAPT. STERN: Why…\p" .string "Why would TEAM AQUA steal my\n" .string "SUBMARINE EXPLORER 1?\p" - .string "They can’t be after the slumbering\n" + .string "They can't be after the slumbering\n" .string "POKéMON at the bottom of the sea…\p" .string "But even if I were to chase them,\n" - .string "I don’t stand a chance against them…$" + .string "I don't stand a chance against them…$" SlateportCity_Harbor_Text_20D42B: @ 820D42B .string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p" .string "Okay… So TEAM AQUA left before you\n" .string "could stop them…\p" - .string "Oh, no, don’t blame yourself.\n" - .string "You’re not responsible for this.\p" + .string "Oh, no, don't blame yourself.\n" + .string "You're not responsible for this.\p" .string "Trying to catch a submarine…\n" - .string "It’s impossible for most people.\p" + .string "It's impossible for most people.\p" .string "You would need a POKéMON that knows\n" .string "how to DIVE…\p" .string "Perhaps if you went out to\n" @@ -508,7 +508,7 @@ SlateportCity_Harbor_Text_20D42B: @ 820D42B SlateportCity_Harbor_Text_20D58A: @ 820D58A .string "CAPT. STERN: Trying to catch a\n" - .string "submarine… It’s impossible.\p" + .string "submarine… It's impossible.\p" .string "You would need a POKéMON that knows\n" .string "how to DIVE…\p" .string "Perhaps if you went out to\n" @@ -519,21 +519,21 @@ SlateportCity_Harbor_Text_20D58A: @ 820D58A SlateportCity_Harbor_Text_20D65C: @ 820D65C .string "CAPT. STERN: Oh, yes.\n" .string "MR. BRINEY came to our SHIPYARD.\p" - .string "It won’t be long now before we finish\n" + .string "It won't be long now before we finish\n" .string "making the ferry!$" SlateportCity_Harbor_Text_20D6CB: @ 820D6CB .string "CAPT. STERN: {PLAYER}{KUN}!\p" .string "We finally finished making the ferry\n" .string "S.S. TIDAL!\p" - .string "We couldn’t have done it without\n" + .string "We couldn't have done it without\n" .string "your friend MR. BRINEY.\p" .string "Please go for a short cruise on it!$" SlateportCity_Harbor_Text_20D76C: @ 820D76C .string "CAPT. STERN: Oh?\n" .string "{PLAYER}{KUN}, that item you have…\p" - .string "That’s a SCANNER! That would sure\n" + .string "That's a SCANNER! That would sure\n" .string "help us on our explorations.\p" .string "{PLAYER}{KUN}, would you trade your\n" .string "SCANNER for something?\p" @@ -542,16 +542,16 @@ SlateportCity_Harbor_Text_20D76C: @ 820D76C SlateportCity_Harbor_Text_20D841: @ 820D841 .string "CAPT. STERN: Are you certain?\n" - .string "It’s useless to you, {PLAYER}{KUN}…\p" + .string "It's useless to you, {PLAYER}{KUN}…\p" .string "Well, okay, then. If you want to trade\n" .string "your SCANNER, let me know.$" SlateportCity_Harbor_Text_20D8BC: @ 820D8BC - .string "CAPT. STERN: So you’ll trade it for\n" + .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEATOOTH?$" SlateportCity_Harbor_Text_20D8F1: @ 820D8F1 - .string "CAPT. STERN: So you’ll trade it for\n" + .string "CAPT. STERN: So you'll trade it for\n" .string "my DEEPSEASCALE?$" SlateportCity_Harbor_Text_20D926: @ 820D926 diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index 745cc6627..aaec06a21 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_House1_MapScripts:: @ 8209AA4 SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 lock faceplayer - msgbox SlateportCity_House1_Text_209B8E, 5 + msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209AC6 compare VAR_RESULT, 0 @@ -12,7 +12,7 @@ SlateportCity_House1_EventScript_209AA5:: @ 8209AA5 end SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 - msgbox SlateportCity_House1_Text_209BFF, 4 + msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT special sub_81B94B0 waitstate compare VAR_0x8004, 255 @@ -22,7 +22,7 @@ SlateportCity_House1_EventScript_209AC6:: @ 8209AC6 end SlateportCity_House1_EventScript_209AE9:: @ 8209AE9 - msgbox SlateportCity_House1_Text_209D42, 4 + msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT release end @@ -38,7 +38,7 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B50 - msgbox SlateportCity_House1_Text_209C2B, 5 + msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B5A compare VAR_RESULT, 0 @@ -46,39 +46,39 @@ SlateportCity_House1_EventScript_209AF3:: @ 8209AF3 end SlateportCity_House1_EventScript_209B46:: @ 8209B46 - msgbox SlateportCity_House1_Text_209E74, 4 + msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B50:: @ 8209B50 - msgbox SlateportCity_House1_Text_209DF0, 4 + msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B5A:: @ 8209B5A - msgbox SlateportCity_House1_Text_209CA4, 4 + msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT call SlateportCity_House1_EventScript_2723DD specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated compare VAR_RESULT, 1 goto_eq SlateportCity_House1_EventScript_209B84 - msgbox SlateportCity_House1_Text_209D5E, 4 + msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT release end SlateportCity_House1_EventScript_209B84:: @ 8209B84 - msgbox SlateportCity_House1_Text_209CD4, 4 + msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT release end SlateportCity_House1_Text_209B8E: @ 8209B8E - .string "Hi, hi! I’m the NAME RATER!\n" - .string "I’m the fortune-teller of names!\p" + .string "Hi, hi! I'm the NAME RATER!\n" + .string "I'm the fortune-teller of names!\p" .string "I shall be pleased to rate your\n" - .string "POKéMON’s nickname.$" + .string "POKéMON's nickname.$" SlateportCity_House1_Text_209BFF: @ 8209BFF - .string "Which POKéMON’s nickname should\n" + .string "Which POKéMON's nickname should\n" .string "I critique?$" SlateportCity_House1_Text_209C2B: @ 8209C2B @@ -112,7 +112,7 @@ SlateportCity_House1_Text_209DF0: @ 8209DF0 .string "Hmmm… {STR_VAR_1} it is!\p" .string "This is a magnificent nickname!\n" .string "It is impeccably beyond reproach!\p" - .string "You’ll do well to cherish your\n" + .string "You'll do well to cherish your\n" .string "{STR_VAR_1} now and beyond.$" SlateportCity_House1_Text_209E74: @ 8209E74 diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 28a05ed38..1661d8fc5 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_House2_MapScripts:: @ 820D9AE .byte 0 SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF - msgbox SlateportCity_House2_Text_20D9C1, 2 + msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC end SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8 - msgbox SlateportCity_House2_Text_20DA59, 2 + msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC end SlateportCity_House2_Text_20D9C1: @ 820D9C1 @@ -17,7 +17,7 @@ SlateportCity_House2_Text_20D9C1: @ 820D9C1 .string "do with the stat gains of POKéMON.$" SlateportCity_House2_Text_20DA59: @ 820DA59 - .string "You’re a TRAINER, aren’t you?\p" + .string "You're a TRAINER, aren't you?\p" .string "Since you came to SLATEPORT CITY,\n" .string "you must be going to the BATTLE TENT.$" diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index da217f809..cc1eff7f6 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SlateportCity_Mart_EventScript_20DC49:: @ 820DC49 message gUnknown_08272A21 waitmessage pokemart SlateportCity_Mart_Pokemart_20DC60 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -26,11 +26,11 @@ SlateportCity_Mart_Pokemart_20DC60: @ 820DC60 end SlateportCity_Mart_EventScript_20DC76:: @ 820DC76 - msgbox SlateportCity_Mart_Text_20DC88, 2 + msgbox SlateportCity_Mart_Text_20DC88, MSGBOX_NPC end SlateportCity_Mart_EventScript_20DC7F:: @ 820DC7F - msgbox SlateportCity_Mart_Text_20DCF8, 2 + msgbox SlateportCity_Mart_Text_20DCF8, MSGBOX_NPC end SlateportCity_Mart_Text_20DC88: @ 820DC88 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 0ed39c118..3c777b184 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -2,7 +2,7 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95 .byte 0 SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F @@ -21,7 +21,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1 showmoneybox 0, 0, 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, 5 + msgbox SlateportCity_OceanicMuseum_1F_Text_20AFD5, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8 closemessage @@ -41,7 +41,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 takemoney 0x32, 0 updatemoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -52,7 +52,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 checkflag FLAG_0x095 goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox nop @@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 end SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT setvar VAR_0x40AA, 1 hidemoneybox nop @@ -76,79 +76,79 @@ SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B0E8, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE56:: @ 820AE56 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B112, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE5F:: @ 820AE5F - msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B165, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE68:: @ 820AE68 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B19C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE71:: @ 820AE71 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B1D4, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE7A:: @ 820AE7A - msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B218, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AE83:: @ 820AE83 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B4CF, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE8C:: @ 820AE8C - msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B547, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE95:: @ 820AE95 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B5CA, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AE9E:: @ 820AE9E - msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B699, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEA7:: @ 820AEA7 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B74B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB0:: @ 820AEB0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B81F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEB9:: @ 820AEB9 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B912, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AEC2:: @ 820AEC2 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B9C0, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AECB:: @ 820AECB - msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, 3 + msgbox SlateportCity_OceanicMuseum_1F_Text_20BA9C, MSGBOX_SIGN end SlateportCity_OceanicMuseum_1F_EventScript_20AED4:: @ 820AED4 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B25F, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEDD:: @ 820AEDD - msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B2A2, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEE6:: @ 820AEE6 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B302, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEEF:: @ 820AEEF - msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, 2 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B369, MSGBOX_NPC end SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 @@ -160,12 +160,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_27259A waitmovement 0 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B3AB, MSGBOX_DEFAULT giveitem_std ITEM_TM46 compare VAR_RESULT, 0 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 setflag FLAG_0x10D - msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 goto_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C @@ -205,7 +205,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFAA:: @ 820AFAA end SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 - msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, 4 + msgbox SlateportCity_OceanicMuseum_1F_Text_20B49B, MSGBOX_DEFAULT release end @@ -248,14 +248,14 @@ SlateportCity_OceanicMuseum_1F_Text_20B026: @ 820B026 .string "Please enjoy yourself.$" SlateportCity_OceanicMuseum_1F_Text_20B03D: @ 820B03D - .string "Oh? I’m sorry, but you don’t seem to\n" + .string "Oh? I'm sorry, but you don't seem to\n" .string "have enough money.$" SlateportCity_OceanicMuseum_1F_Text_20B075: @ 820B075 - .string "Oh? You’re with that group that\n" + .string "Oh? You're with that group that\n" .string "went in earlier?\p" - .string "You’re the only one who’s late.\n" - .string "You’d better go catch up to them!$" + .string "You're the only one who's late.\n" + .string "You'd better go catch up to them!$" SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 .string "We, TEAM AQUA, exist for the good\n" @@ -264,7 +264,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B0E8: @ 820B0E8 SlateportCity_OceanicMuseum_1F_Text_20B112: @ 820B112 .string "We were told to assemble here,\n" .string "so we did, but…\p" - .string "Our BOSS, the linchpin, isn’t here.$" + .string "Our BOSS, the linchpin, isn't here.$" SlateportCity_OceanicMuseum_1F_Text_20B165: @ 820B165 .string "If I ripped off the stuff here,\n" @@ -275,11 +275,11 @@ SlateportCity_OceanicMuseum_1F_Text_20B19C: @ 820B19C .string "nefarious deeds…$" SlateportCity_OceanicMuseum_1F_Text_20B1D4: @ 820B1D4 - .string "If our goons didn’t bungle things\n" - .string "in RUSTBORO, we wouldn’t be here!$" + .string "If our goons didn't bungle things\n" + .string "in RUSTBORO, we wouldn't be here!$" SlateportCity_OceanicMuseum_1F_Text_20B218: @ 820B218 - .string "I didn’t have ¥50, so it took a long\n" + .string "I didn't have ¥50, so it took a long\n" .string "time getting by the receptionist.$" SlateportCity_OceanicMuseum_1F_Text_20B25F: @ 820B25F @@ -296,7 +296,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B302: @ 820B302 .string "The sea is vast without end, and\n" .string "infinitely deep…\p" .string "There must be many POKéMON that\n" - .string "we don’t know about.$" + .string "we don't know about.$" SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 .string "I want a sea POKéMON.\p" @@ -306,7 +306,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B369: @ 820B369 SlateportCity_OceanicMuseum_1F_Text_20B3AB: @ 820B3AB .string "Aiyeeeh!\n" .string "What are you doing here?\p" - .string "Me? I’m the TEAM AQUA member\n" + .string "Me? I'm the TEAM AQUA member\n" .string "you thumped before, remember?\l" .string "Back in RUSTURF TUNNEL?\p" .string "Here, take this!\n" @@ -332,10 +332,10 @@ SlateportCity_OceanicMuseum_1F_Text_20B547: @ 820B547 .string "A red ball is bobbing up and down\n" .string "inside a glass vessel.\p" .string "“This is an experiment simulating a\n" - .string "WATERFALL using the ball’s buoyancy.”$" + .string "WATERFALL using the ball's buoyancy.”$" SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA - .string "It’s a sample of soil from the ocean\n" + .string "It's a sample of soil from the ocean\n" .string "floor.\p" .string "“Over many years, the remains of\n" .string "life-forms settle at the bottom of\l" @@ -344,7 +344,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B5CA: @ 820B5CA .string "ancient past is revealed.”$" SlateportCity_OceanicMuseum_1F_Text_20B699: @ 820B699 - .string "It’s a sample of beach sand.\p" + .string "It's a sample of beach sand.\p" .string "“Stones from mountains are washed\n" .string "down by rivers where they are\l" .string "chipped and ground down.\p" @@ -379,7 +379,7 @@ SlateportCity_OceanicMuseum_1F_Text_20B912: @ 820B912 .string "the size of land.”$" SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 - .string "It’s a fossil with wavy ridges on it.\p" + .string "It's a fossil with wavy ridges on it.\p" .string "“Soil on the ocean floor gets scoured\n" .string "by the tide.\p" .string "“The flowing seawater marks the soil\n" @@ -390,6 +390,6 @@ SlateportCity_OceanicMuseum_1F_Text_20B9C0: @ 820B9C0 SlateportCity_OceanicMuseum_1F_Text_20BA9C: @ 820BA9C .string "A strange machine is rotating under\n" .string "a glass dome.\p" - .string "Maybe it’s for measuring the depth\n" + .string "Maybe it's for measuring the depth\n" .string "of something…$" diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index f31a0d386..040a76396 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -4,7 +4,7 @@ SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BD8D, MSGBOX_DEFAULT closemessage playbgm MUS_AQA_0, 1 addobject 3 @@ -20,11 +20,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 compare VAR_FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BC92 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT compare VAR_FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_20BC9D - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, 4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT + msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 @@ -32,32 +32,32 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 compare VAR_FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 - trainerbattle 3, TRAINER_GRUNT_14, 0, SlateportCity_OceanicMuseum_2F_Text_20BEE2 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, 4 + trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, 4 - trainerbattle 3, TRAINER_GRUNT_15, 0, SlateportCity_OceanicMuseum_2F_Text_20BF66 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF35, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_2725AA applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_2725A6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT closemessage delay 35 addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCFE waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20BFF2, MSGBOX_DEFAULT closemessage applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_20BCD6 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C059, MSGBOX_DEFAULT closemessage savebgm MUS_DUMMY fadedefaultbgm @@ -70,10 +70,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_2725A8 waitmovement 0 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT setvar VAR_0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_2723E4 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C36C, MSGBOX_DEFAULT closemessage fadescreen 1 playfanfare MUS_ME_ASA @@ -216,57 +216,57 @@ SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4F9, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD13:: @ 820BD13 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C566, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD1C:: @ 820BD1C - msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C5C6, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD25:: @ 820BD25 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C6C7, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD2E:: @ 820BD2E - msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C72F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD37:: @ 820BD37 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C7C1, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD40:: @ 820BD40 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C82F, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD49:: @ 820BD49 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C88B, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD52:: @ 820BD52 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C8E8, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD5B:: @ 820BD5B - msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, 3 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C93A, MSGBOX_SIGN end SlateportCity_OceanicMuseum_2F_EventScript_20BD64:: @ 820BD64 - msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C43F, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD6D:: @ 820BD6D - msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, 2 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C495, MSGBOX_NPC end SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 lock faceplayer - msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, 4 + msgbox SlateportCity_OceanicMuseum_2F_Text_20C4C2, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_2725A2 waitmovement 0 @@ -274,23 +274,23 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BD76:: @ 820BD76 end SlateportCity_OceanicMuseum_2F_Text_20BD8D: @ 820BD8D - .string "Yes? If you’re looking for STERN,\n" + .string "Yes? If you're looking for STERN,\n" .string "that would be me.\p" .string "Ah! Those must be the parts I ordered\n" .string "from MR. STONE of DEVON.\p" - .string "Thank you! That’s great!\n" + .string "Thank you! That's great!\n" .string "We can prepare for our expedition now.$" SlateportCity_OceanicMuseum_2F_Text_20BE40: @ 820BE40 .string "Hehehe, hold it!\n" - .string "We’ll take those parts!$" + .string "We'll take those parts!$" SlateportCity_OceanicMuseum_2F_Text_20BE69: @ 820BE69 .string "CAPT. STERN: Wh-what?\n" .string "Who are you people?$" SlateportCity_OceanicMuseum_2F_Text_20BE93: @ 820BE93 - .string "We’re TEAM AQUA!\p" + .string "We're TEAM AQUA!\p" .string "Our BOSS wants those parts!\n" .string "Shut your yap and fork them over!$" @@ -311,9 +311,9 @@ SlateportCity_OceanicMuseum_2F_Text_20BF66: @ 820BF66 .string "I lost, too!$" SlateportCity_OceanicMuseum_2F_Text_20BF7A: @ 820BF7A - .string "Now what? If we don’t get the parts,\n" - .string "we’re in for it!\p" - .string "Arrgh, I didn’t count on being meddled\n" + .string "Now what? If we don't get the parts,\n" + .string "we're in for it!\p" + .string "Arrgh, I didn't count on being meddled\n" .string "with by some meddling kid!$" SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 @@ -324,33 +324,33 @@ SlateportCity_OceanicMuseum_2F_Text_20BFF2: @ 820BFF2 SlateportCity_OceanicMuseum_2F_Text_20C059: @ 820C059 .string "We are TEAM AQUA,\n" .string "and we love the sea!\p" - .string "And I am TEAM AQUA’s leader,\n" + .string "And I am TEAM AQUA's leader,\n" .string "ARCHIE!\p" .string "What makes you interfere with us?\p" - .string "…No! You can’t be!\n" - .string "You’re not one of TEAM MAGMA?\p" - .string "Wait, that can’t be right.\n" - .string "You’re not dressed for the part.\p" + .string "…No! You can't be!\n" + .string "You're not one of TEAM MAGMA?\p" + .string "Wait, that can't be right.\n" + .string "You're not dressed for the part.\p" .string "… … … … … …\n" .string "… … … … … …\p" .string "POKéMON, people… All life depends on\n" .string "the sea.\p" .string "So, TEAM AQUA is dedicated to\n" .string "the expansion of the sea.\p" - .string "Don’t you agree? What we are doing\n" + .string "Don't you agree? What we are doing\n" .string "is a magnificent undertaking.\p" .string "Ah, fine…\n" - .string "You’re still too young to understand\l" + .string "You're still too young to understand\l" .string "our noble objective.\p" - .string "But, I warn you, don’t even consider\n" + .string "But, I warn you, don't even consider\n" .string "interfering with our plans again.\p" .string "The consequences will cost you\n" .string "dearly!\p" - .string "And don’t you forget it!$" + .string "And don't you forget it!$" SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE - .string "CAPT. STERN: You’re…\n" - .string "Ah, okay, you’re {PLAYER}{KUN}…\p" + .string "CAPT. STERN: You're…\n" + .string "Ah, okay, you're {PLAYER}{KUN}…\p" .string "Anyway, that was a tense situation!\n" .string "Thank you for saving us!\p" .string "Oh, yes, I almost forgot that you\n" @@ -358,10 +358,10 @@ SlateportCity_OceanicMuseum_2F_Text_20C2BE: @ 820C2BE SlateportCity_OceanicMuseum_2F_Text_20C36C: @ 820C36C .string "CAPT. STERN: Whoops!\n" - .string "There’s no time to lose!\p" + .string "There's no time to lose!\p" .string "We have to set out on our ocean-floor\n" .string "expedition really soon.\p" - .string "Thanks again, but now I’ve got\n" + .string "Thanks again, but now I've got\n" .string "to go!\p" .string "Feel free to wander around and check\n" .string "out our facilities, though.$" @@ -372,11 +372,11 @@ SlateportCity_OceanicMuseum_2F_Text_20C43F: @ 820C43F .string "near DEWFORD TOWN…$" SlateportCity_OceanicMuseum_2F_Text_20C495: @ 820C495 - .string "Don’t you dare run around inside\n" + .string "Don't you dare run around inside\n" .string "the MUSEUM!$" SlateportCity_OceanicMuseum_2F_Text_20C4C2: @ 820C4C2 - .string "Wow, the submarine’s awesome!\n" + .string "Wow, the submarine's awesome!\n" .string "I want to go for a ride!$" SlateportCity_OceanicMuseum_2F_Text_20C4F9: @ 820C4F9 @@ -404,25 +404,25 @@ SlateportCity_OceanicMuseum_2F_Text_20C5C6: @ 820C5C6 SlateportCity_OceanicMuseum_2F_Text_20C6C7: @ 820C6C7 .string "“MODEL OF HOENN REGION”\p" - .string "It’s a miniature diorama of the\n" + .string "It's a miniature diorama of the\n" .string "HOENN region.\p" .string "Where is LITTLEROOT TOWN on this?$" SlateportCity_OceanicMuseum_2F_Text_20C72F: @ 820C72F - .string "It’s a display on the flow of seawater.\p" + .string "It's a display on the flow of seawater.\p" .string "“Near the bottom of the sea, water\n" .string "flows due to differences in such\l" .string "factors as temperature and salinity.”$" SlateportCity_OceanicMuseum_2F_Text_20C7C1: @ 820C7C1 - .string "It’s a display on the flow of seawater.\p" + .string "It's a display on the flow of seawater.\p" .string "“Toward the surface, seawater flows\n" .string "as currents driven by the winds.”$" SlateportCity_OceanicMuseum_2F_Text_20C82F: @ 820C82F .string "“THE FERRY S.S. TIDAL\p" .string "“A scale replica of the ship under\n" - .string "construction at STERN’S SHIPYARD.”$" + .string "construction at STERN'S SHIPYARD.”$" SlateportCity_OceanicMuseum_2F_Text_20C88B: @ 820C88B .string "“SUBMARINE EXPLORER 1\p" diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index dd62280bb..db8cc19d7 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -17,18 +17,18 @@ SlateportCity_PokemonCenter_1F_EventScript_20DAD3:: @ 820DAD3 end SlateportCity_PokemonCenter_1F_EventScript_20DAE1:: @ 820DAE1 - msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DAF3, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_EventScript_20DAEA:: @ 820DAEA - msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, 2 + msgbox SlateportCity_PokemonCenter_1F_Text_20DBBC, MSGBOX_NPC end SlateportCity_PokemonCenter_1F_Text_20DAF3: @ 820DAF3 .string "Want a tip for battling?\p" - .string "I’d say it’s raising different kinds\n" + .string "I'd say it's raising different kinds\n" .string "of POKéMON in a balanced manner.\p" - .string "It’s no good to make just one\n" + .string "It's no good to make just one\n" .string "POKéMON strong.\p" .string "If it has a type disadvantage,\n" .string "it might not stand a chance.$" diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 307f42af5..154438ae2 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 setvar VAR_0x40B7, 1 - msgbox SlateportCity_PokemonFanClub_Text_20A445, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end @@ -37,17 +37,17 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 call_if 1, SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 goto_eq SlateportCity_PokemonFanClub_EventScript_209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A62A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT goto SlateportCity_PokemonFanClub_EventScript_209F45 end SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B - msgbox SlateportCity_PokemonFanClub_Text_20A9E1, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 - msgbox SlateportCity_PokemonFanClub_Text_20A65F, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 checkflag FLAG_0x0CC call_if 0, SlateportCity_PokemonFanClub_EventScript_20A13B @@ -79,7 +79,7 @@ SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0 return SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6 - msgbox SlateportCity_PokemonFanClub_Text_20A66E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT release end @@ -87,10 +87,10 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 checkitemspace ITEM_RED_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C8 giveitem_std ITEM_RED_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A827, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT release end @@ -98,10 +98,10 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 checkitemspace ITEM_BLUE_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0C9 giveitem_std ITEM_BLUE_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A880, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT release end @@ -109,10 +109,10 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 checkitemspace ITEM_PINK_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CA giveitem_std ITEM_PINK_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A8D7, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT release end @@ -120,10 +120,10 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 checkitemspace ITEM_GREEN_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CB giveitem_std ITEM_GREEN_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A933, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT release end @@ -131,15 +131,15 @@ SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 checkitemspace ITEM_YELLOW_SCARF, 1 compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A795, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT setflag FLAG_0x0CC giveitem_std ITEM_YELLOW_SCARF - msgbox SlateportCity_PokemonFanClub_Text_20A984, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5 - msgbox SlateportCity_PokemonFanClub_Text_20A719, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT release end @@ -196,18 +196,18 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 checkflag FLAG_0x156 goto_eq SlateportCity_PokemonFanClub_EventScript_20A168 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 release end SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 - msgbox SlateportCity_PokemonFanClub_Text_20A3EE, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 - msgbox SlateportCity_PokemonFanClub_Text_20A233, 4 + msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT setflag FLAG_0x156 return @@ -216,7 +216,7 @@ SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E faceplayer checkflag FLAG_0x116 goto_eq SlateportCity_PokemonFanClub_EventScript_20A1DE - msgbox SlateportCity_PokemonFanClub_Text_20AA77, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_20A1A3 @@ -229,7 +229,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 waitmovement 0 applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_27259A waitmovement 0 - msgbox SlateportCity_PokemonFanClub_Text_20AB63, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_eq SlateportCity_PokemonFanClub_EventScript_272054 @@ -238,16 +238,16 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 end SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE - msgbox SlateportCity_PokemonFanClub_Text_20ABC4, 4 + msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT release end SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8 - msgbox SlateportCity_PokemonFanClub_Text_20AC47, 2 + msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1 - msgbox SlateportCity_PokemonFanClub_Text_20ACF9, 2 + msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC end SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA @@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA faceplayer waitse playmoncry SPECIES_SKITTY, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD5A, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT waitmoncry release end @@ -265,7 +265,7 @@ SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D faceplayer waitse playmoncry SPECIES_ZIGZAGOON, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD6E, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT waitmoncry release end @@ -275,7 +275,7 @@ SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SlateportCity_PokemonFanClub_Text_20AD80, 4 + msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT waitmoncry release end @@ -289,9 +289,9 @@ SlateportCity_PokemonFanClub_Text_20A233: @ 820A233 .string "to raising POKéMON. No one!\p" .string "Well, let me tell you about\n" .string "POKéMON CONTESTS.\p" - .string "They’re events where one can show off\n" + .string "They're events where one can show off\n" .string "POKéMON for the world to see!\p" - .string "However, they’re held in far-off towns,\n" + .string "However, they're held in far-off towns,\n" .string "so I cannot participate often enough.\p" .string "That is why we gather here to show\n" .string "off our POKéMON, and have others\l" @@ -303,7 +303,7 @@ SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE .string "That, I would like to see.$" SlateportCity_PokemonFanClub_Text_20A445: @ 820A445 - .string "Er-hem! I see you’ve participated in\n" + .string "Er-hem! I see you've participated in\n" .string "a POKéMON CONTEST!\p" .string "Please! Allow me to examine how you\n" .string "have raised your POKéMON.\p" @@ -329,7 +329,7 @@ SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F .string "I see…$" SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E - .string "Hmmm… It’s not bad, but it’s not\n" + .string "Hmmm… It's not bad, but it's not\n" .string "good, either…\p" .string "You, the TRAINER, must put more\n" .string "effort into raising this POKéMON!\p" @@ -372,13 +372,13 @@ SlateportCity_PokemonFanClub_Text_20A933: @ 820A933 SlateportCity_PokemonFanClub_Text_20A984: @ 820A984 .string "Let a POKéMON hold that YELLOW SCARF.\p" - .string "It will bolster your POKéMON’s\n" + .string "It will bolster your POKéMON's\n" .string "toughness so much more!$" SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1 - .string "I’m sorry, but I’ve nothing else to\n" + .string "I'm sorry, but I've nothing else to\n" .string "give you! None at all!\p" - .string "After all, you’re blessed with the gift\n" + .string "After all, you're blessed with the gift\n" .string "of raising POKéMON without resorting\l" .string "to any items!$" @@ -388,7 +388,7 @@ SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77 .string "POKéMON are very sensitive to\n" .string "the feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.\p" + .string "and care, they'll love you back.\p" .string "When your POKéMON grow to love you,\n" .string "please come show me.$" @@ -401,14 +401,14 @@ SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4 .string "POKéMON are very sensitive to\n" .string "the feelings of their TRAINERS.\p" .string "If you treat your POKéMON with love\n" - .string "and care, they’ll love you back.$" + .string "and care, they'll love you back.$" SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47 .string "If you keep letting a POKéMON faint\n" - .string "in battle, it’ll come to resent it.\p" + .string "in battle, it'll come to resent it.\p" .string "Soon, it will become less trusting\n" .string "of the TRAINER.\p" - .string "In other words, it certainly won’t\n" + .string "In other words, it certainly won't\n" .string "like you very much.$" SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index 20bbc6fc4..82138168c 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -11,10 +11,10 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FD9 checkflag FLAG_0x094 goto_eq SlateportCity_SternsShipyard_1F_EventScript_207FBA - msgbox SlateportCity_SternsShipyard_1F_Text_208008, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 @@ -26,21 +26,21 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208323, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 @@ -50,20 +50,20 @@ SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 - msgbox SlateportCity_SternsShipyard_1F_Text_208213, 4 + msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT releaseall end SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED - msgbox SlateportCity_SternsShipyard_1F_Text_208558, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6 - msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF - msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, 2 + msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC end SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 @@ -71,18 +71,18 @@ SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008 .string "goes over there…\p" .string "Then where does this thing go?\n" .string "And what about that doohickey?\p" - .string "Aaargh! I can’t make heads or tails\n" + .string "Aaargh! I can't make heads or tails\n" .string "of this!$" SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5 .string "Hm?\n" - .string "Hi, I’m DOCK.\p" + .string "Hi, I'm DOCK.\p" .string "CAPT. STERN commissioned me to\n" .string "design a ferry.\p" .string "Oh! That there…\n" .string "Are they DEVON GOODS?\p" .string "But, hmm…\n" - .string "This won’t do…\p" + .string "This won't do…\p" .string "CAPT. STERN went off somewhere.\n" .string "He said he had some work to do.\p" .string "Could I get you to go find CAPT.\n" @@ -96,13 +96,13 @@ SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5 SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213 .string "DOCK: Shipbuilding is an art.\p" - .string "A lot of things can’t be figured out\n" + .string "A lot of things can't be figured out\n" .string "just by calculating.\p" .string "I really could use advice from a veteran\n" .string "who knows the seas…$" SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8 - .string "DOCK: Hi! MR. BRINEY’s joined us to\n" + .string "DOCK: Hi! MR. BRINEY's joined us to\n" .string "lend us his help.\p" .string "Thanks to the veteran sailor, the\n" .string "ferry is steadily coming together.$" @@ -113,22 +113,22 @@ SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323 .string "of technology!\p" .string "But, I get the feeling that we can\n" .string "make something even better.\p" - .string "You know, there’s never an end to\n" - .string "technology’s march.$" + .string "You know, there's never an end to\n" + .string "technology's march.$" SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE .string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n" - .string "It’s been too long!\p" - .string "Aye, since I met you, this old sea dog’s\n" + .string "It's been too long!\p" + .string "Aye, since I met you, this old sea dog's\n" .string "been feeling frisky!\p" - .string "So I’ve decided to help DOCK make\n" + .string "So I've decided to help DOCK make\n" .string "a ferry.\p" .string "Aye, after all, a ferry would be able\n" .string "to carry a lot of people.\p" .string "But, you know, that DOCK is really\n" .string "something special.\p" .string "With his knack for technology and\n" - .string "my experience, I’m sure that we can\l" + .string "my experience, I'm sure that we can\l" .string "build one great ship, aye!$" SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 @@ -136,7 +136,7 @@ SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558 .string "the moon sits in the sky…\p" .string "These and other conditions make\n" .string "the sea change its expression.\p" - .string "That’s right!\n" + .string "That's right!\n" .string "The sea is like a living thing!$" SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc index a599ac9b8..6fa410dfe 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc @@ -2,11 +2,11 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D .byte 0 SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E - msgbox SlateportCity_SternsShipyard_2F_Text_208650, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647 - msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, 2 + msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC end SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 @@ -15,7 +15,7 @@ SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650 .string "together a transportation vehicle.$" SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA - .string "Don’t you think it’s strange that\n" + .string "Don't you think it's strange that\n" .string "a ship made of heavy iron floats?\p" .string "It floats because of a principle\n" .string "called buoyancy.$" diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index f5dcdab74..de6ca59db 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -704,22 +704,22 @@ SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D goto_eq SootopolisCity_EventScript_1E5ECE compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E5EBA - msgbox SootopolisCity_Text_1E6D77, 4 + msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA - msgbox SootopolisCity_Text_1E6DFE, 4 + msgbox SootopolisCity_Text_1E6DFE, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4 - msgbox SootopolisCity_Text_1E6F38, 4 + msgbox SootopolisCity_Text_1E6F38, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE - msgbox SootopolisCity_Text_1E6ED4, 4 + msgbox SootopolisCity_Text_1E6ED4, MSGBOX_DEFAULT release end @@ -732,7 +732,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 goto_if 4, SootopolisCity_EventScript_1E5F1B compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E5F10 - msgbox SootopolisCity_Text_1E6BFF, 4 + msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT closemessage applymovement 3, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -740,7 +740,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8 end SootopolisCity_EventScript_1E5F10:: @ 81E5F10 - msgbox SootopolisCity_Text_1E6C53, 4 + msgbox SootopolisCity_Text_1E6C53, MSGBOX_DEFAULT closemessage release end @@ -750,7 +750,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B special GetPlayerBigGuyGirlString checkflag FLAG_0x932 goto_eq SootopolisCity_EventScript_1E5FBB - msgbox SootopolisCity_Text_2A7BB0, 4 + msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 addvar VAR_RESULT, 133 @@ -758,7 +758,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 setflag FLAG_0x932 - msgbox SootopolisCity_Text_2A7C7C, 4 + msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_1E5F79 @@ -770,7 +770,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79 giveitem_std ITEM_FIGY_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end @@ -778,20 +778,20 @@ SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A giveitem_std ITEM_IAPAPA_BERRY compare VAR_RESULT, 0 goto_eq SootopolisCity_EventScript_272054 - msgbox SootopolisCity_Text_2A7CB7, 4 + msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB - msgbox SootopolisCity_Text_2A7CEC, 5 + msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_EventScript_1E5FD8 - msgbox SootopolisCity_Text_2A7DD2, 4 + msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8 - msgbox SootopolisCity_Text_2A7D80, 4 + msgbox SootopolisCity_Text_2A7D80, MSGBOX_DEFAULT release end @@ -801,7 +801,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E600D - msgbox SootopolisCity_Text_1E71A1, 4 + msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT closemessage applymovement 2, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -809,7 +809,7 @@ SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2 end SootopolisCity_EventScript_1E600D:: @ 81E600D - msgbox SootopolisCity_Text_1E728C, 4 + msgbox SootopolisCity_Text_1E728C, MSGBOX_DEFAULT releaseall end @@ -818,12 +818,12 @@ SootopolisCity_EventScript_1E6017:: @ 81E6017 faceplayer compare VAR_0x405E, 6 goto_if 4, SootopolisCity_EventScript_1E602E - msgbox SootopolisCity_Text_1E6CCA, 4 + msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E602E:: @ 81E602E - msgbox SootopolisCity_Text_1E6D57, 4 + msgbox SootopolisCity_Text_1E6D57, MSGBOX_DEFAULT release end @@ -836,12 +836,12 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038 goto_eq SootopolisCity_EventScript_1E6084 compare VAR_0x405E, 2 goto_if 4, SootopolisCity_EventScript_1E6065 - msgbox SootopolisCity_Text_1E6F90, 4 + msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6065:: @ 81E6065 - msgbox SootopolisCity_Text_1E7078, 4 + msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT closemessage applymovement 8, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -849,12 +849,12 @@ SootopolisCity_EventScript_1E6065:: @ 81E6065 end SootopolisCity_EventScript_1E607A:: @ 81E607A - msgbox SootopolisCity_Text_1E710B, 4 + msgbox SootopolisCity_Text_1E710B, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6084:: @ 81E6084 - msgbox SootopolisCity_Text_1E70D4, 4 + msgbox SootopolisCity_Text_1E70D4, MSGBOX_DEFAULT release end @@ -868,7 +868,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E goto_if 4, SootopolisCity_EventScript_1E60CF compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E60CF - msgbox SootopolisCity_Text_1E690B, 4 + msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT closemessage applymovement 4, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -876,12 +876,12 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E end SootopolisCity_EventScript_1E60CF:: @ 81E60CF - msgbox SootopolisCity_Text_1E68A1, 4 + msgbox SootopolisCity_Text_1E68A1, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E60D9:: @ 81E60D9 - msgbox SootopolisCity_Text_1E6920, 4 + msgbox SootopolisCity_Text_1E6920, MSGBOX_DEFAULT release end @@ -897,7 +897,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 goto_if 4, SootopolisCity_EventScript_1E6141 compare VAR_0x405E, 1 goto_if 3, SootopolisCity_EventScript_1E6141 - msgbox SootopolisCity_Text_1E6692, 4 + msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT closemessage applymovement 5, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -905,30 +905,30 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3 end SootopolisCity_EventScript_1E612D:: @ 81E612D - msgbox SootopolisCity_Text_1E6750, 4 + msgbox SootopolisCity_Text_1E6750, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6137:: @ 81E6137 - msgbox SootopolisCity_Text_1E677F, 4 + msgbox SootopolisCity_Text_1E677F, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E6141:: @ 81E6141 - msgbox SootopolisCity_Text_1E6618, 4 + msgbox SootopolisCity_Text_1E6618, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E614B:: @ 81E614B - msgbox SootopolisCity_Text_1E656F, 3 + msgbox SootopolisCity_Text_1E656F, MSGBOX_SIGN end SootopolisCity_EventScript_1E6154:: @ 81E6154 - msgbox SootopolisCity_Text_1E65C8, 3 + msgbox SootopolisCity_Text_1E65C8, MSGBOX_SIGN end EventScript_ClosedSootopolisDoor:: @ 81E615D - msgbox SootopolisCity_Text_1E6604, 3 + msgbox SootopolisCity_Text_1E6604, MSGBOX_SIGN end SootopolisCity_EventScript_1E6166:: @ 81E6166 @@ -945,33 +945,33 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 goto_eq SootopolisCity_EventScript_1E61C2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E61B8 - msgbox SootopolisCity_Text_1E78E5, 4 + msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61AE:: @ 81E61AE - msgbox SootopolisCity_Text_1E7866, 4 + msgbox SootopolisCity_Text_1E7866, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61B8:: @ 81E61B8 - msgbox SootopolisCity_Text_1E794B, 4 + msgbox SootopolisCity_Text_1E794B, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61C2:: @ 81E61C2 - msgbox SootopolisCity_Text_1E789A, 4 + msgbox SootopolisCity_Text_1E789A, MSGBOX_DEFAULT releaseall end SootopolisCity_EventScript_1E61CC:: @ 81E61CC - msgbox SootopolisCity_Text_1E75CB, 4 + msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT closemessage compare VAR_FACING, 3 call_if 1, SootopolisCity_EventScript_1E6243 compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E6255 - msgbox SootopolisCity_Text_1E7737, 4 + msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT closemessage applymovement 7, SootopolisCity_Movement_1E62D4 applymovement 255, SootopolisCity_Movement_1E630E @@ -982,7 +982,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC applymovement 7, SootopolisCity_Movement_1E6344 applymovement 255, SootopolisCity_Movement_1E634F waitmovement 0 - msgbox SootopolisCity_Text_1E77F0, 4 + msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage setflag FLAG_0x133 applymovement 255, SootopolisCity_Movement_1E635A @@ -1273,7 +1273,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6388 - msgbox SootopolisCity_Text_1E67DC, 4 + msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT closemessage applymovement 15, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1281,7 +1281,7 @@ SootopolisCity_EventScript_1E635D:: @ 81E635D end SootopolisCity_EventScript_1E6388:: @ 81E6388 - msgbox SootopolisCity_Text_1E6853, 4 + msgbox SootopolisCity_Text_1E6853, MSGBOX_DEFAULT closemessage releaseall end @@ -1290,11 +1290,11 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E63C7 - msgbox SootopolisCity_Text_1E6936, 4 + msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E696C, 4 + msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT closemessage applymovement 14, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1304,7 +1304,7 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393 SootopolisCity_EventScript_1E63C7:: @ 81E63C7 applymovement 14, SootopolisCity_Movement_27259E waitmovement 0 - msgbox SootopolisCity_Text_1E69B8, 4 + msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT releaseall end @@ -1314,7 +1314,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6406 - msgbox SootopolisCity_Text_1E6C7C, 4 + msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT closemessage applymovement 13, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1322,7 +1322,7 @@ SootopolisCity_EventScript_1E63DB:: @ 81E63DB end SootopolisCity_EventScript_1E6406:: @ 81E6406 - msgbox SootopolisCity_Text_1E6CA6, 4 + msgbox SootopolisCity_Text_1E6CA6, MSGBOX_DEFAULT closemessage releaseall end @@ -1333,7 +1333,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 waitmovement 0 compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E643C - msgbox SootopolisCity_Text_1E6A50, 4 + msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT closemessage applymovement 12, SootopolisCity_Movement_2725A2 waitmovement 0 @@ -1341,7 +1341,7 @@ SootopolisCity_EventScript_1E6411:: @ 81E6411 end SootopolisCity_EventScript_1E643C:: @ 81E643C - msgbox SootopolisCity_Text_1E6B2A, 4 + msgbox SootopolisCity_Text_1E6B2A, MSGBOX_DEFAULT releaseall end @@ -1354,15 +1354,15 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 goto_eq SootopolisCity_EventScript_1E64E2 checkflag FLAG_0x09E goto_eq SootopolisCity_EventScript_1E646F - msgbox SootopolisCity_Text_1E7A3E, 4 + msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E646F:: @ 81E646F - msgbox SootopolisCity_Text_1E7ACF, 4 + msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT giveitem_std ITEM_HM07 setflag FLAG_0x138 - msgbox SootopolisCity_Text_1E7B86, 4 + msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_EventScript_1E64B2 @@ -1388,12 +1388,12 @@ SootopolisCity_EventScript_1E64C5:: @ 81E64C5 return SootopolisCity_EventScript_1E64D8:: @ 81E64D8 - msgbox SootopolisCity_Text_1E79C8, 4 + msgbox SootopolisCity_Text_1E79C8, MSGBOX_DEFAULT release end SootopolisCity_EventScript_1E64E2:: @ 81E64E2 - msgbox SootopolisCity_Text_1E7CBC, 4 + msgbox SootopolisCity_Text_1E7CBC, MSGBOX_DEFAULT release end @@ -1411,13 +1411,13 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6509 - msgbox SootopolisCity_Text_1E72DB, 4 + msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6509:: @ 81E6509 - msgbox SootopolisCity_Text_1E737E, 4 + msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT setflag FLAG_0x135 checkflag FLAG_0x134 goto_eq SootopolisCity_EventScript_1E654C @@ -1428,13 +1428,13 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F lockall compare VAR_0x405E, 5 goto_eq SootopolisCity_EventScript_1E6536 - msgbox SootopolisCity_Text_1E7460, 4 + msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT closemessage releaseall end SootopolisCity_EventScript_1E6536:: @ 81E6536 - msgbox SootopolisCity_Text_1E74F6, 4 + msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT setflag FLAG_0x134 checkflag FLAG_0x135 goto_eq SootopolisCity_EventScript_1E654C @@ -1485,10 +1485,10 @@ SootopolisCity_Text_1E6618: @ 81E6618 SootopolisCity_Text_1E6692: @ 81E6692 .string "These giant POKéMON suddenly appeared\n" .string "in the middle of the city!\p" - .string "And, I’ve never seen them before!\p" + .string "And, I've never seen them before!\p" .string "Why are they smashing into each\n" .string "other like that?\p" - .string "Why can’t they be friends, those\n" + .string "Why can't they be friends, those\n" .string "POKéMON?$" SootopolisCity_Text_1E6750: @ 81E6750 @@ -1503,8 +1503,8 @@ SootopolisCity_Text_1E677F: @ 81E677F SootopolisCity_Text_1E67DC: @ 81E67DC .string "I just get this sense somehow that\n" - .string "the two POKéMON aren’t angry.\p" - .string "I think… They probably can’t control\n" + .string "the two POKéMON aren't angry.\p" + .string "I think… They probably can't control\n" .string "their own power…$" SootopolisCity_Text_1E6853: @ 81E6853 @@ -1513,7 +1513,7 @@ SootopolisCity_Text_1E6853: @ 81E6853 .string "POKéMON…$" SootopolisCity_Text_1E68A1: @ 81E68A1 - .string "I… I’ve never been out of this city.\p" + .string "I… I've never been out of this city.\p" .string "I wonder what the world is like on\n" .string "the other side of this round sky?$" @@ -1527,7 +1527,7 @@ SootopolisCity_Text_1E6920: @ 81E6920 SootopolisCity_Text_1E6936: @ 81E6936 .string "Go for it, red POKéMON!\n" - .string "Don’t back off, blue POKéMON!$" + .string "Don't back off, blue POKéMON!$" SootopolisCity_Text_1E696C: @ 81E696C .string "… … … … … …\p" @@ -1537,20 +1537,20 @@ SootopolisCity_Text_1E696C: @ 81E696C SootopolisCity_Text_1E69B8: @ 81E69B8 .string "I was wondering which one would win,\n" .string "the red one or the blue one, but, oh no,\l" - .string "it’s the green one that settles things!\p" + .string "it's the green one that settles things!\p" .string "Talk about a huge turn of events!$" SootopolisCity_Text_1E6A50: @ 81E6A50 - .string "There’s an ancient legend that claims\n" + .string "There's an ancient legend that claims\n" .string "the land and sea were shaped by\l" .string "a colossal battle between POKéMON.\p" - .string "Well, I’m seeing that happen with\n" + .string "Well, I'm seeing that happen with\n" .string "my very own eyes!\p" .string "Whoa! I never expected to be\n" .string "witness to something this huge!$" SootopolisCity_Text_1E6B2A: @ 81E6B2A - .string "There’s an ancient legend that claims\n" + .string "There's an ancient legend that claims\n" .string "the land and sea were shaped by\l" .string "a colossal battle between POKéMON.\p" .string "Well, I saw that happen with\n" @@ -1572,13 +1572,13 @@ SootopolisCity_Text_1E6C7C: @ 81E6C7C .string "SOOTOPOLIS CITY will get wrecked!$" SootopolisCity_Text_1E6CA6: @ 81E6CA6 - .string "SOOTOPOLIS CITY didn’t get wrecked!$" + .string "SOOTOPOLIS CITY didn't get wrecked!$" SootopolisCity_Text_1E6CCA: @ 81E6CCA .string "Hm!\n" - .string "You’ve come all the way to SOOTOPOLIS?\l" - .string "You’re no ordinary tourist.\p" - .string "But I suppose that doesn’t make you\n" + .string "You've come all the way to SOOTOPOLIS?\l" + .string "You're no ordinary tourist.\p" + .string "But I suppose that doesn't make you\n" .string "an extraordinary tourist, either.$" SootopolisCity_Text_1E6D57: @ 81E6D57 @@ -1617,12 +1617,12 @@ SootopolisCity_Text_1E6F90: @ 81E6F90 .string "If you look up at the sky, the lip of\n" .string "the crater is also visible.\l" .string "So, all you see is the sky in a circle.\p" - .string "But that’s what makes the sky above\n" + .string "But that's what makes the sky above\n" .string "SOOTOPOLIS the most beautiful.$" SootopolisCity_Text_1E7078: @ 81E7078 .string "When two POKéMON that gigantic\n" - .string "are fighting that savagely, there’s\l" + .string "are fighting that savagely, there's\l" .string "not much that we can do.$" SootopolisCity_Text_1E70D4: @ 81E70D4 @@ -1634,7 +1634,7 @@ SootopolisCity_Text_1E710B: @ 81E710B .string "the crater of a volcano…\p" .string "And in that ring, stars flicker and\n" .string "blink as if they were alive…\l" - .string "It’s my favorite scenery.$" + .string "It's my favorite scenery.$" SootopolisCity_Text_1E71A1: @ 81E71A1 .string "The weather was clear this morning,\n" @@ -1651,33 +1651,33 @@ SootopolisCity_Text_1E728C: @ 81E728C .string "Oh?\p" .string "It was you who brought that flying\n" .string "POKéMON here?\p" - .string "Well, aren’t you amazing!$" + .string "Well, aren't you amazing!$" SootopolisCity_Text_1E72DB: @ 81E72DB .string "MAXIE: G… GROUDON…\n" - .string "Please! Stop what you’re doing!\p" + .string "Please! Stop what you're doing!\p" .string "I know the extent of your power now!\p" .string "If you keep going, all HOENN, not just\n" .string "SOOTOPOLIS, will be utterly ruined!$" SootopolisCity_Text_1E737E: @ 81E737E .string "MAXIE: So the super-ancient POKéMON\n" - .string "weren’t only GROUDON and KYOGRE…\p" + .string "weren't only GROUDON and KYOGRE…\p" .string "After all our fruitless scheming and\n" - .string "frantic efforts, that one POKéMON’s\l" + .string "frantic efforts, that one POKéMON's\l" .string "simple action puts everything right\l" .string "again as if nothing had happened…\p" .string "Fu…\n" .string "Fuhahaha…$" SootopolisCity_Text_1E7460: @ 81E7460 - .string "ARCHIE: KYOGRE! What’s wrong?!\n" - .string "Look over here! It’s the RED ORB!\l" + .string "ARCHIE: KYOGRE! What's wrong?!\n" + .string "Look over here! It's the RED ORB!\l" .string "Calm down! KYOGRE!\p" .string "… … … … … …\n" .string "… … … … … …\p" - .string "It’s no good!\n" - .string "It’s not responding at all!$" + .string "It's no good!\n" + .string "It's not responding at all!$" SootopolisCity_Text_1E74F6: @ 81E74F6 .string "ARCHIE: KYOGRE and GROUDON both\n" @@ -1698,67 +1698,67 @@ SootopolisCity_Text_1E75CB: @ 81E75CB .string "And now they are smashing each other\n" .string "with their uncontrollable energy…\p" .string "…{PLAYER}{KUN}.\p" - .string "You being here now I’ll take to mean\n" - .string "that you’re prepared to become\l" + .string "You being here now I'll take to mean\n" + .string "that you're prepared to become\l" .string "involved in this crisis.\p" - .string "Well, then, there’s someone that\n" - .string "I’d like you to meet.\p" + .string "Well, then, there's someone that\n" + .string "I'd like you to meet.\p" .string "Come with me, please.$" SootopolisCity_Text_1E7737: @ 81E7737 .string "STEVEN: Listen, {PLAYER}{KUN}.\p" .string "Does seeing GROUDON and KYOGRE make\n" .string "you think POKéMON are to be feared?\p" - .string "But that’s not true.\n" + .string "But that's not true.\n" .string "POKéMON are really more…\p" .string "…Why am I asking you this?\n" .string "You already know.$" SootopolisCity_Text_1E77F0: @ 81E77F0 .string "STEVEN: Okay, here we are!\p" - .string "Inside here you’ll find someone named\n" + .string "Inside here you'll find someone named\n" .string "WALLACE.\p" - .string "I think you have what’s needed to\n" + .string "I think you have what's needed to\n" .string "help him…$" SootopolisCity_Text_1E7866: @ 81E7866 - .string "STEVEN: I think you have what’s\n" + .string "STEVEN: I think you have what's\n" .string "needed to help him…$" SootopolisCity_Text_1E789A: @ 81E789A .string "STEVEN: The SKY PILLAR…\p" - .string "I’ve never been there.\n" + .string "I've never been there.\n" .string "I wonder where it could be?$" SootopolisCity_Text_1E78E5: @ 81E78E5 - .string "STEVEN: So that’s RAYQUAZA…\p" - .string "It’s incredible how the two rampaging\n" + .string "STEVEN: So that's RAYQUAZA…\p" + .string "It's incredible how the two rampaging\n" .string "POKéMON would flee from it in fear…$" SootopolisCity_Text_1E794B: @ 81E794B .string "STEVEN: It looks like both MAXIE and\n" .string "ARCHIE have gone away somewhere.\p" - .string "Perhaps they’ve gone to MT. PYRE to\n" + .string "Perhaps they've gone to MT. PYRE to\n" .string "return those ORBS…$" SootopolisCity_Text_1E79C8: @ 81E79C8 .string "WALLACE: Oh?\n" .string "{PLAYER}{KUN}?\p" - .string "Haven’t you scaled the SKY PILLAR\n" + .string "Haven't you scaled the SKY PILLAR\n" .string "yet?\p" - .string "I’m sure that you can make it to\n" + .string "I'm sure that you can make it to\n" .string "the top of the SKY PILLAR…$" SootopolisCity_Text_1E7A3E: @ 81E7A3E .string "WALLACE: {PLAYER}{KUN}…\p" .string "The leaders of TEAM MAGMA and AQUA,\n" - .string "I don’t think they meant harm.\p" - .string "It wouldn’t hurt to hear what they\n" + .string "I don't think they meant harm.\p" + .string "It wouldn't hurt to hear what they\n" .string "have to say for themselves.$" SootopolisCity_Text_1E7ACF: @ 81E7ACF .string "WALLACE: {PLAYER}{KUN}…\n" - .string "My eyes didn’t deceive me.\p" + .string "My eyes didn't deceive me.\p" .string "Thanks to your help, SOOTOPOLIS…\n" .string "No, all of HOENN was saved.\p" .string "On behalf of the people, I thank you.\p" @@ -1772,13 +1772,13 @@ SootopolisCity_Text_1E7B86: @ 81E7B86 .string "that has learned that HM move can\l" .string "force its way up waterfalls.\p" .string "And where does one get the RAIN BADGE?\n" - .string "You know, don’t you?\p" - .string "That’s right! You have to beat\n" + .string "You know, don't you?\p" + .string "That's right! You have to beat\n" .string "the SOOTOPOLIS GYM LEADER.\p" - .string "When you’re all set to go, step through\n" + .string "When you're all set to go, step through\n" .string "that door.$" SootopolisCity_Text_1E7CBC: @ 81E7CBC - .string "WALLACE: I’m sure that you will be\n" - .string "dazzled by my mentor’s breathtakingly\l" + .string "WALLACE: I'm sure that you will be\n" + .string "dazzled by my mentor's breathtakingly\l" .string "elegant battle style.$" diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index e95a57769..570f936b5 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 - trainerbattle 1, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82 + trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225268, SootopolisCity_Gym_1F_Text_225432, SootopolisCity_Gym_1F_EventScript_224F82, NO_MUSIC specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq SootopolisCity_Gym_1F_EventScript_225025 @@ -94,7 +94,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 goto_if 0, SootopolisCity_Gym_1F_EventScript_224FF7 checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_22501B - msgbox SootopolisCity_Gym_1F_Text_225778, 4 + msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release end @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 message SootopolisCity_Gym_1F_Text_225598 waitmessage call SootopolisCity_Gym_1F_EventScript_27207E - msgbox SootopolisCity_Gym_1F_Text_2255BE, 4 + msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT setflag FLAG_0x4F7 setflag FLAG_BADGE08_GET setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS @@ -116,7 +116,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox SootopolisCity_Gym_1F_Text_22574D, 4 + msgbox SootopolisCity_Gym_1F_Text_22574D, MSGBOX_DEFAULT waitfanfare closemessage delay 30 @@ -128,7 +128,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_27205E - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC return @@ -136,19 +136,19 @@ SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 giveitem_std ITEM_TM03 compare VAR_RESULT, 0 goto_eq SootopolisCity_Gym_1F_EventScript_272054 - msgbox SootopolisCity_Gym_1F_Text_2256C1, 4 + msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT setflag FLAG_0x0AC release end SootopolisCity_Gym_1F_EventScript_22501B:: @ 822501B - msgbox SootopolisCity_Gym_1F_Text_225865, 4 + msgbox SootopolisCity_Gym_1F_Text_225865, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 - trainerbattle 7, TRAINER_JUAN_1, 0, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 - msgbox SootopolisCity_Gym_1F_Text_225A67, 6 + trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_225950, SootopolisCity_Gym_1F_Text_225A2E, SootopolisCity_Gym_1F_Text_225B48 + msgbox SootopolisCity_Gym_1F_Text_225A67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 @@ -156,12 +156,12 @@ SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 faceplayer checkflag FLAG_0x4F7 goto_eq SootopolisCity_Gym_1F_EventScript_225055 - msgbox SootopolisCity_Gym_1F_Text_225093, 4 + msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end SootopolisCity_Gym_1F_EventScript_225055:: @ 8225055 - msgbox SootopolisCity_Gym_1F_Text_2251AF, 4 + msgbox SootopolisCity_Gym_1F_Text_2251AF, MSGBOX_DEFAULT release end @@ -180,32 +180,32 @@ SootopolisCity_Gym_1F_EventScript_22506F:: @ 822506F end SootopolisCity_Gym_1F_EventScript_22507F:: @ 822507F - msgbox SootopolisCity_Gym_1F_Text_225916, 4 + msgbox SootopolisCity_Gym_1F_Text_225916, MSGBOX_DEFAULT releaseall end SootopolisCity_Gym_1F_EventScript_225089:: @ 8225089 - msgbox SootopolisCity_Gym_1F_Text_2258FA, 4 + msgbox SootopolisCity_Gym_1F_Text_2258FA, MSGBOX_DEFAULT releaseall end SootopolisCity_Gym_1F_Text_225093: @ 8225093 - .string "Yo! How’s it going, CHAMPION-\n" + .string "Yo! How's it going, CHAMPION-\n" .string "bound {PLAYER}?\p" - .string "SOOTOPOLIS’s GYM LEADER JUAN is\n" + .string "SOOTOPOLIS's GYM LEADER JUAN is\n" .string "a master of WATER-type POKéMON.\p" .string "And, to get to JUAN, an icy floor\n" .string "will hamper your progress…\p" - .string "Listen, I’m sorry, but that’s all the\n" + .string "Listen, I'm sorry, but that's all the\n" .string "advice that I have for you.\p" .string "The rest of the way, you have to\n" .string "go for it yourself!$" SootopolisCity_Gym_1F_Text_2251AF: @ 82251AF - .string "Yow! You’ve beaten even JUAN, who\n" + .string "Yow! You've beaten even JUAN, who\n" .string "was supposedly the best in all HOENN!\p" .string "Okay! Check out your TRAINER CARD.\p" - .string "If you’ve gotten all the BADGES, you’re\n" + .string "If you've gotten all the BADGES, you're\n" .string "set for the POKéMON LEAGUE challenge!$" SootopolisCity_Gym_1F_Text_225268: @ 8225268 @@ -289,7 +289,7 @@ SootopolisCity_Gym_1F_Text_2258FA: @ 82258FA SootopolisCity_Gym_1F_Text_225916: @ 8225916 .string "SOOTOPOLIS CITY POKéMON GYM\p" - .string "JUAN’S CERTIFIED TRAINERS:\n" + .string "JUAN'S CERTIFIED TRAINERS:\n" .string "{PLAYER}$" SootopolisCity_Gym_1F_Text_225950: @ 8225950 diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index 8aaa604e2..0f402b930 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,57 +2,57 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A .byte 0 SootopolisCity_Gym_B1F_EventScript_225C8B:: @ 8225C8B - trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 - msgbox SootopolisCity_Gym_B1F_Text_225DCF, 6 + trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_225D71, SootopolisCity_Gym_B1F_Text_225DB6 + msgbox SootopolisCity_Gym_B1F_Text_225DCF, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CA2:: @ 8225CA2 - trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 - msgbox SootopolisCity_Gym_B1F_Text_225E90, 6 + trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_225E04, SootopolisCity_Gym_B1F_Text_225E60 + msgbox SootopolisCity_Gym_B1F_Text_225E90, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CB9:: @ 8225CB9 - trainerbattle 0, TRAINER_BRIANNA, 0, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 - msgbox SootopolisCity_Gym_B1F_Text_2264BC, 6 + trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_22646E, SootopolisCity_Gym_B1F_Text_226495 + msgbox SootopolisCity_Gym_B1F_Text_2264BC, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CD0:: @ 8225CD0 - trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB - msgbox SootopolisCity_Gym_B1F_Text_225FFE, 6 + trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_225FBE, SootopolisCity_Gym_B1F_Text_225FEB + msgbox SootopolisCity_Gym_B1F_Text_225FFE, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CE7:: @ 8225CE7 - trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 - msgbox SootopolisCity_Gym_B1F_Text_2260D1, 6 + trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_226061, SootopolisCity_Gym_B1F_Text_2260B6 + msgbox SootopolisCity_Gym_B1F_Text_2260D1, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225CFE:: @ 8225CFE - trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 - msgbox SootopolisCity_Gym_B1F_Text_2261B5, 6 + trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_226164, SootopolisCity_Gym_B1F_Text_2261A7 + msgbox SootopolisCity_Gym_B1F_Text_2261B5, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D15:: @ 8225D15 - trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 - msgbox SootopolisCity_Gym_B1F_Text_226286, 6 + trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_2261F7, SootopolisCity_Gym_B1F_Text_226274 + msgbox SootopolisCity_Gym_B1F_Text_226286, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D2C:: @ 8225D2C - trainerbattle 0, TRAINER_BETHANY, 0, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B - msgbox SootopolisCity_Gym_B1F_Text_226341, 6 + trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_2262F3, SootopolisCity_Gym_B1F_Text_22633B + msgbox SootopolisCity_Gym_B1F_Text_226341, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D43:: @ 8225D43 - trainerbattle 0, TRAINER_ANNIKA, 0, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD - msgbox SootopolisCity_Gym_B1F_Text_2263F4, 6 + trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_226388, SootopolisCity_Gym_B1F_Text_2263BD + msgbox SootopolisCity_Gym_B1F_Text_2263F4, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_EventScript_225D5A:: @ 8225D5A - trainerbattle 0, TRAINER_DAPHNE, 0, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 - msgbox SootopolisCity_Gym_B1F_Text_225F67, 6 + trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_225ED6, SootopolisCity_Gym_B1F_Text_225F35 + msgbox SootopolisCity_Gym_B1F_Text_225F67, MSGBOX_AUTOCLOSE end SootopolisCity_Gym_B1F_Text_225D71: @ 8225D71 - .string "I’ll show you the sublime techniques\n" + .string "I'll show you the sublime techniques\n" .string "I learned from our LEADER JUAN!$" SootopolisCity_Gym_B1F_Text_225DB6: @ 8225DB6 @@ -63,12 +63,12 @@ SootopolisCity_Gym_B1F_Text_225DCF: @ 8225DCF .string "the floor tiles.$" SootopolisCity_Gym_B1F_Text_225E04: @ 8225E04 - .string "You came all the way here, but you won’t\n" + .string "You came all the way here, but you won't\n" .string "get to see JUAN.\p" - .string "Not if you lose to me, you won’t!$" + .string "Not if you lose to me, you won't!$" SootopolisCity_Gym_B1F_Text_225E60: @ 8225E60 - .string "You’re strong!\n" + .string "You're strong!\n" .string "I was fooled by your cute looks!$" SootopolisCity_Gym_B1F_Text_225E90: @ 8225E90 @@ -88,7 +88,7 @@ SootopolisCity_Gym_B1F_Text_225F35: @ 8225F35 SootopolisCity_Gym_B1F_Text_225F67: @ 8225F67 .string "The grace you bring to battle is\n" .string "fabulous.\p" - .string "Oh… I’m so fortunate to have found\n" + .string "Oh… I'm so fortunate to have found\n" .string "POKéMON.$" SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE @@ -97,17 +97,17 @@ SootopolisCity_Gym_B1F_Text_225FBE: @ 8225FBE SootopolisCity_Gym_B1F_Text_225FEB: @ 8225FEB .string "Oh.\n" - .string "You’re strong.$" + .string "You're strong.$" SootopolisCity_Gym_B1F_Text_225FFE: @ 8225FFE - .string "I’ll tell you something good.\p" + .string "I'll tell you something good.\p" .string "If you want to reach JUAN, you\n" .string "need to walk on each floor tile once.$" SootopolisCity_Gym_B1F_Text_226061: @ 8226061 .string "The POKéMON GYM of the highest level\n" .string "in the HOENN region…\p" - .string "That’s the SOOTOPOLIS GYM.$" + .string "That's the SOOTOPOLIS GYM.$" SootopolisCity_Gym_B1F_Text_2260B6: @ 82260B6 .string "What a high level you are!$" @@ -121,14 +121,14 @@ SootopolisCity_Gym_B1F_Text_2260D1: @ 82260D1 SootopolisCity_Gym_B1F_Text_226164: @ 8226164 .string "I train my POKéMON together with\n" .string "JUAN.\p" - .string "Don’t think I’m a pushover.$" + .string "Don't think I'm a pushover.$" SootopolisCity_Gym_B1F_Text_2261A7: @ 82261A7 .string "I was beaten…$" SootopolisCity_Gym_B1F_Text_2261B5: @ 82261B5 .string "I think you have potential.\n" - .string "Why don’t you stay and train with us?$" + .string "Why don't you stay and train with us?$" SootopolisCity_Gym_B1F_Text_2261F7: @ 82261F7 .string "A graceful glide across the ice while\n" @@ -145,7 +145,7 @@ SootopolisCity_Gym_B1F_Text_226286: @ 8226286 .string "with how young or old you are.$" SootopolisCity_Gym_B1F_Text_2262F3: @ 82262F3 - .string "When I’m with my POKéMON, the time\n" + .string "When I'm with my POKéMON, the time\n" .string "flies by before you can say, “Oops!”$" SootopolisCity_Gym_B1F_Text_22633B: @ 822633B @@ -157,7 +157,7 @@ SootopolisCity_Gym_B1F_Text_226341: @ 8226341 SootopolisCity_Gym_B1F_Text_226388: @ 8226388 .string "I can battle with really rare POKéMON\n" - .string "if you’d like.$" + .string "if you'd like.$" SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD .string "Oh, there now! Did you have a good look\n" @@ -166,7 +166,7 @@ SootopolisCity_Gym_B1F_Text_2263BD: @ 82263BD SootopolisCity_Gym_B1F_Text_2263F4: @ 82263F4 .string "I came to this GYM because JUAN\n" .string "praised me for my darling POKéMON.\p" - .string "Oh, if only I’d met JUAN years ago\n" + .string "Oh, if only I'd met JUAN years ago\n" .string "when I was younger…$" SootopolisCity_Gym_B1F_Text_22646E: @ 822646E @@ -178,6 +178,6 @@ SootopolisCity_Gym_B1F_Text_226495: @ 8226495 .string "I went much too easy on you.$" SootopolisCity_Gym_B1F_Text_2264BC: @ 82264BC - .string "You couldn’t lay a finger on JUAN,\n" - .string "I’m sure. Giggle…$" + .string "You couldn't lay a finger on JUAN,\n" + .string "I'm sure. Giggle…$" diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 7c898a0b2..3a41c70eb 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -6,17 +6,17 @@ SootopolisCity_House1_EventScript_22694D:: @ 822694D faceplayer checkflag FLAG_0x079 goto_eq SootopolisCity_House1_EventScript_226984 - msgbox SootopolisCity_House1_Text_2269A1, 4 + msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 goto_eq SootopolisCity_House1_EventScript_272054 setflag FLAG_0x079 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end SootopolisCity_House1_EventScript_226984:: @ 8226984 - msgbox SootopolisCity_House1_Text_226A13, 4 + msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end @@ -25,20 +25,20 @@ SootopolisCity_House1_EventScript_22698E:: @ 822698E faceplayer waitse playmoncry SPECIES_KECLEON, 0 - msgbox SootopolisCity_House1_Text_226A60, 4 + msgbox SootopolisCity_House1_Text_226A60, MSGBOX_DEFAULT waitmoncry release end SootopolisCity_House1_Text_2269A1: @ 82269A1 - .string "For thirty years I’ve remained in\n" + .string "For thirty years I've remained in\n" .string "SOOTOPOLIS honing my skills.\p" .string "I developed a shattering TM.\n" .string "I bequeath it to you!$" SootopolisCity_House1_Text_226A13: @ 8226A13 - .string "TM31 contains BRICK BREAK! It’s a move\n" - .string "so horrible that I can’t describe it.$" + .string "TM31 contains BRICK BREAK! It's a move\n" + .string "so horrible that I can't describe it.$" SootopolisCity_House1_Text_226A60: @ 8226A60 .string "KECLEON: Puu puhyaah.$" diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index 82270ca56..676ec4ed2 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_House2_MapScripts:: @ 8226A76 SootopolisCity_House2_EventScript_226A77:: @ 8226A77 lock faceplayer - msgbox SootopolisCity_House2_Text_226AAB, 5 + msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO compare VAR_RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_226A99 compare VAR_RESULT, 0 @@ -13,11 +13,11 @@ SootopolisCity_House2_EventScript_226A77:: @ 8226A77 end SootopolisCity_House2_EventScript_226A99:: @ 8226A99 - msgbox SootopolisCity_House2_Text_226AF1, 4 + msgbox SootopolisCity_House2_Text_226AF1, MSGBOX_DEFAULT return SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2 - msgbox SootopolisCity_House2_Text_226B41, 4 + msgbox SootopolisCity_House2_Text_226B41, MSGBOX_DEFAULT return SootopolisCity_House2_Text_226AAB: @ 8226AAB diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index 415f90642..ec8ad87ed 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -4,25 +4,25 @@ SootopolisCity_House3_MapScripts:: @ 8226B71 SootopolisCity_House3_EventScript_226B72:: @ 8226B72 lock faceplayer - msgbox SootopolisCity_House3_Text_226BA4, 5 + msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_eq SootopolisCity_House3_EventScript_226B91 - msgbox SootopolisCity_House3_Text_226C44, 4 + msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B91:: @ 8226B91 - msgbox SootopolisCity_House3_Text_226C20, 4 + msgbox SootopolisCity_House3_Text_226C20, MSGBOX_DEFAULT release end SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B - msgbox SootopolisCity_House3_Text_226C9C, 2 + msgbox SootopolisCity_House3_Text_226C9C, MSGBOX_NPC end SootopolisCity_House3_Text_226BA4: @ 8226BA4 - .string "You’re a POKéMON TRAINER, aren’t you?\p" - .string "SOOTOPOLIS’s JUAN has many fans.\n" + .string "You're a POKéMON TRAINER, aren't you?\p" + .string "SOOTOPOLIS's JUAN has many fans.\n" .string "Even more than his student WALLACE!\p" .string "Do you have any?$" @@ -31,7 +31,7 @@ SootopolisCity_House3_Text_226C20: @ 8226C20 SootopolisCity_House3_Text_226C44: @ 8226C44 .string "Oh, dear…\n" - .string "That’s a little lonesome.\p" + .string "That's a little lonesome.\p" .string "Try working a little harder to get\n" .string "a fan following.$" diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc index e34e6991d..a8aa58548 100644 --- a/data/maps/SootopolisCity_House4/scripts.inc +++ b/data/maps/SootopolisCity_House4/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House4_MapScripts:: @ 8226D15 .byte 0 SootopolisCity_House4_EventScript_226D16:: @ 8226D16 - msgbox SootopolisCity_House4_Text_226D3B, 2 + msgbox SootopolisCity_House4_Text_226D3B, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F - msgbox SootopolisCity_House4_Text_226DEA, 2 + msgbox SootopolisCity_House4_Text_226DEA, MSGBOX_NPC end SootopolisCity_House4_EventScript_226D28:: @ 8226D28 @@ -14,15 +14,15 @@ SootopolisCity_House4_EventScript_226D28:: @ 8226D28 faceplayer waitse playmoncry SPECIES_AZUMARILL, 0 - msgbox SootopolisCity_House4_Text_226E7F, 4 + msgbox SootopolisCity_House4_Text_226E7F, MSGBOX_DEFAULT waitmoncry release end SootopolisCity_House4_Text_226D3B: @ 8226D3B - .string "Listen up, and I’ll tell you something\n" + .string "Listen up, and I'll tell you something\n" .string "good.\p" - .string "There’s supposed to be an ancient\n" + .string "There's supposed to be an ancient\n" .string "ruin in the sea around here.\p" .string "There could be treasures just waiting\n" .string "to be discovered down there.$" @@ -30,7 +30,7 @@ SootopolisCity_House4_Text_226D3B: @ 8226D3B SootopolisCity_House4_Text_226DEA: @ 8226DEA .string "Ancient treasures…\p" .string "It would be nice if they existed, but\n" - .string "even if they didn’t, it would be so\l" + .string "even if they didn't, it would be so\l" .string "beautiful to take an underwater\l" .string "stroll with my POKéMON.$" diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc index 51da02de1..04b9feca2 100644 --- a/data/maps/SootopolisCity_House5/scripts.inc +++ b/data/maps/SootopolisCity_House5/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House5_MapScripts:: @ 8226E93 .byte 0 SootopolisCity_House5_EventScript_226E94:: @ 8226E94 - msgbox SootopolisCity_House5_Text_226EA6, 2 + msgbox SootopolisCity_House5_Text_226EA6, MSGBOX_NPC end SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D - msgbox SootopolisCity_House5_Text_226F35, 2 + msgbox SootopolisCity_House5_Text_226F35, MSGBOX_NPC end SootopolisCity_House5_Text_226EA6: @ 8226EA6 diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 38c8456a3..dbdb1cbae 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -6,10 +6,10 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C faceplayer checkflag FLAG_0x0F5 goto_eq SootopolisCity_House6_EventScript_226FA3 - msgbox SootopolisCity_House6_Text_226FC3, 5 + msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_226F99 - msgbox SootopolisCity_House6_Text_227034, 4 + msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT givedecoration_std 117 compare VAR_RESULT, 0 goto_eq SootopolisCity_House6_EventScript_226FAD @@ -18,26 +18,26 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C end SootopolisCity_House6_EventScript_226F99:: @ 8226F99 - msgbox SootopolisCity_House6_Text_22708F, 4 + msgbox SootopolisCity_House6_Text_22708F, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3 - msgbox SootopolisCity_House6_Text_2270B7, 4 + msgbox SootopolisCity_House6_Text_2270B7, MSGBOX_DEFAULT release end SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD bufferdecorationname 1, 117 - msgbox gUnknown_08272B1A, 4 - msgbox SootopolisCity_House6_Text_22704A, 4 + msgbox gUnknown_08272B1A, MSGBOX_DEFAULT + msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT release end SootopolisCity_House6_Text_226FC3: @ 8226FC3 - .string "Hello! You’re our first guest in\n" + .string "Hello! You're our first guest in\n" .string "a good while.\p" - .string "You’ve brightened up my day, so I’ll\n" + .string "You've brightened up my day, so I'll\n" .string "give you a big WAILMER DOLL.$" SootopolisCity_House6_Text_227034: @ 8227034 @@ -45,11 +45,11 @@ SootopolisCity_House6_Text_227034: @ 8227034 SootopolisCity_House6_Text_22704A: @ 822704A .string "Oh, you want it, but not right now?\n" - .string "Okay, then I’ll hold it for you.$" + .string "Okay, then I'll hold it for you.$" SootopolisCity_House6_Text_22708F: @ 822708F .string "Are you sure?\n" - .string "You don’t want this DOLL?$" + .string "You don't want this DOLL?$" SootopolisCity_House6_Text_2270B7: @ 82270B7 .string "I love plush DOLLS!$" diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc index 9df9cde0b..eac8ef346 100644 --- a/data/maps/SootopolisCity_House7/scripts.inc +++ b/data/maps/SootopolisCity_House7/scripts.inc @@ -2,11 +2,11 @@ SootopolisCity_House7_MapScripts:: @ 82270CB .byte 0 SootopolisCity_House7_EventScript_2270CC:: @ 82270CC - msgbox SootopolisCity_House7_Text_2270DE, 2 + msgbox SootopolisCity_House7_Text_2270DE, MSGBOX_NPC end SootopolisCity_House7_EventScript_2270D5:: @ 82270D5 - msgbox SootopolisCity_House7_Text_227190, 2 + msgbox SootopolisCity_House7_Text_227190, MSGBOX_NPC end SootopolisCity_House7_Text_2270DE: @ 82270DE @@ -14,7 +14,7 @@ SootopolisCity_House7_Text_2270DE: @ 82270DE .string "forced itself up from the depths.\p" .string "Its crater emerged from the sea and\n" .string "became filled with rainwater.\p" - .string "That’s how SOOTOPOLIS CITY came into\n" + .string "That's how SOOTOPOLIS CITY came into\n" .string "being.$" SootopolisCity_House7_Text_227190: @ 8227190 diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc index 26a322b89..b8e037ce3 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B special GetSeedotSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -22,22 +22,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B end SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2 @@ -46,7 +46,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290 end SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, MSGBOX_DEFAULT release end @@ -54,7 +54,7 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC special GetLotadSizeRecordInfo lock faceplayer - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT special sub_81B94B0 waitstate copyvar VAR_RESULT, VAR_0x8004 @@ -71,22 +71,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC end SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT giveitem_std ITEM_ELIXIR compare VAR_RESULT, 0 goto_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343 @@ -95,32 +95,32 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321 end SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343 - msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, MSGBOX_DEFAULT release end SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D special GetSeedotSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, MSGBOX_DEFAULT releaseall end SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B special GetLotadSizeRecordInfo lockall - msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, 4 + msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, MSGBOX_DEFAULT releaseall end SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369 .string "Do you know the POKéMON SEEDOT?\n" - .string "It’s hardly ever seen in SOOTOPOLIS.\p" + .string "It's hardly ever seen in SOOTOPOLIS.\p" .string "Anyway, I love big SEEDOT.\n" .string "The bigger the better.\p" .string "But my younger brother, he says that\n" .string "LOTAD is bigger.\p" - .string "That’s silly.\n" + .string "That's silly.\n" .string "SEEDOT has to be bigger than that!\p" .string "Huh? Do you have a SEEDOT with you?\n" .string "P-p-please, show me!$" @@ -142,32 +142,32 @@ SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524 SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544 .string "{STR_VAR_2} inches, is it?\p" - .string "Hmm… I’ve seen a bigger SEEDOT\n" + .string "Hmm… I've seen a bigger SEEDOT\n" .string "than this one.$" SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584 .string "Oh, now this is quite something…\n" - .string "But it’s not a SEEDOT!$" + .string "But it's not a SEEDOT!$" SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC - .string "You don’t have a big SEEDOT?\n" - .string "That’s too bad…\p" + .string "You don't have a big SEEDOT?\n" + .string "That's too bad…\p" .string "If you get a big SEEDOT, please\n" .string "come show me.$" SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617 .string "The biggest SEEDOT in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch giant!\p" + .string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p" .string "A SEEDOT bigger than a LOTAD\n" .string "always wanted!$" SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676 .string "Do you know the POKéMON LOTAD?\n" - .string "It’s rarely seen in SOOTOPOLIS.\p" + .string "It's rarely seen in SOOTOPOLIS.\p" .string "I love, I mean love, big LOTAD!\p" .string "My big brother says that SEEDOT is\n" .string "bigger.\p" - .string "But that’s wrong! Everyone knows that\n" + .string "But that's wrong! Everyone knows that\n" .string "LOTAD is a lot bigger.\p" .string "Hunh? Do you have a LOTAD?\n" .string "P-p-please show me!$" @@ -189,22 +189,22 @@ SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A .string "{STR_VAR_2} inches?\p" - .string "Hmm… I’ve seen a bigger LOTAD\n" + .string "Hmm… I've seen a bigger LOTAD\n" .string "than this one here.$" SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867 - .string "Well, isn’t this something!\n" - .string "But it’s no LOTAD!$" + .string "Well, isn't this something!\n" + .string "But it's no LOTAD!$" SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896 - .string "Don’t you have a big LOTAD?\n" + .string "Don't you have a big LOTAD?\n" .string "How disappointing…\p" .string "If you get a big LOTAD, please\n" .string "come show me!$" SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2 .string "The biggest LOTAD in history!\n" - .string "{STR_VAR_2}’s {STR_VAR_3}-inch colossus!\p" + .string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p" .string "A LOTAD bigger than a SEEDOT\n" .string "always wanted!$" diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 26ab5497c..6e71ce5e8 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -7,7 +7,7 @@ SootopolisCity_Mart_EventScript_226795:: @ 8226795 message gUnknown_08272A21 waitmessage pokemart SootopolisCity_Mart_Pokemart_2267AC - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -32,12 +32,12 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 goto_if 4, SootopolisCity_Mart_EventScript_2267E2 checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_2267E2 - msgbox SootopolisCity_Mart_Text_22685D, 4 + msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_2267E2:: @ 82267E2 - msgbox SootopolisCity_Mart_Text_226816, 4 + msgbox SootopolisCity_Mart_Text_226816, MSGBOX_DEFAULT release end @@ -48,12 +48,12 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC goto_if 4, SootopolisCity_Mart_EventScript_22680C checkflag FLAG_0x081 goto_if 0, SootopolisCity_Mart_EventScript_22680C - msgbox SootopolisCity_Mart_Text_226928, 4 + msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end SootopolisCity_Mart_EventScript_22680C:: @ 822680C - msgbox SootopolisCity_Mart_Text_2268AF, 4 + msgbox SootopolisCity_Mart_Text_2268AF, MSGBOX_DEFAULT release end @@ -65,14 +65,14 @@ SootopolisCity_Mart_Text_226816: @ 8226816 SootopolisCity_Mart_Text_22685D: @ 822685D .string "What…\n" .string "What is happening?\p" - .string "I really want to know, but it’s too\n" + .string "I really want to know, but it's too\n" .string "scary to go outside.$" SootopolisCity_Mart_Text_2268AF: @ 82268AF .string "Do you know FULL RESTORE?\p" .string "Full restoration of HP!\n" .string "Eradication of all status problems!\p" - .string "It’s truly an item of your dreams!$" + .string "It's truly an item of your dreams!$" SootopolisCity_Mart_Text_226928: @ 8226928 .string "This weather…\n" diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index e11d3ae9f..a2073d3f7 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -51,15 +51,15 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7 end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F @@ -80,25 +80,25 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E compare VAR_TEMP_1, 1 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 special SavePlayerParty special BufferEReaderTrainerName - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special LoadPlayerParty @@ -107,7 +107,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2 special SavePlayerParty special ReducePlayerPartyToSelectedMons - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE @@ -122,12 +122,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2 special LoadPlayerParty - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, MSGBOX_DEFAULT release end SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF - msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, 4 + msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT fadescreen 1 special sub_80F9438 waitstate @@ -182,7 +182,7 @@ SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 .string "When I was young, I traveled the world\n" .string "as a POKéMON TRAINER.\p" - .string "Now that I’ve become an old buzzard,\n" + .string "Now that I've become an old buzzard,\n" .string "my only amusement is watching young\l" .string "TRAINERS battle.$" @@ -196,12 +196,12 @@ SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC .string "{STR_VAR_1}?$" SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44 - .string "You won’t battle? I’m disappointed\n" - .string "that I can’t see you battle…$" + .string "You won't battle? I'm disappointed\n" + .string "that I can't see you battle…$" SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84 .string "Oh, good, good!\p" - .string "But my house isn’t all that sturdy.\p" + .string "But my house isn't all that sturdy.\p" .string "Could I ask you to keep it down to\n" .string "a 3-on-3 match?$" diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index eb21ead54..9a6b4b1b3 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 special CopyEReaderTrainerGreeting - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, SPECIAL_BATTLE_EREADER setvar VAR_0x8005, 0 @@ -41,7 +41,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF setvar VAR_0x40C0, 3 - msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, 4 + msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT return SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 46dccd97e..a4850b9f8 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -22,12 +22,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_22652E checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_22652E - msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_22652E:: @ 822652E - msgbox SootopolisCity_PokemonCenter_1F_Text_226562, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_226562, MSGBOX_DEFAULT release end @@ -38,27 +38,27 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 goto_if 4, SootopolisCity_PokemonCenter_1F_EventScript_226558 checkflag FLAG_0x081 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_EventScript_226558:: @ 8226558 - msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, 4 + msgbox SootopolisCity_PokemonCenter_1F_Text_2266B9, MSGBOX_DEFAULT release end SootopolisCity_PokemonCenter_1F_Text_226562: @ 8226562 .string "WALLACE is rumored to be the toughest\n" .string "TRAINER in the whole HOENN region.\p" - .string "This town’s GYM is led by the TRAINER\n" + .string "This town's GYM is led by the TRAINER\n" .string "who taught WALLACE.\p" - .string "But the ELITE FOUR… They’re said to be\n" - .string "even stronger than WALLACE’s mentor.\p" + .string "But the ELITE FOUR… They're said to be\n" + .string "even stronger than WALLACE's mentor.\p" .string "How strong could they be?$" SootopolisCity_PokemonCenter_1F_Text_22664B: @ 822664B .string "Everyone in town has taken refuge\n" - .string "and won’t come out of their homes.\p" + .string "and won't come out of their homes.\p" .string "Even I would rather not venture\n" .string "outside.$" @@ -66,9 +66,9 @@ SootopolisCity_PokemonCenter_1F_Text_2266B9: @ 82266B9 .string "Whenever, wherever, and whatever\n" .string "happens, I will always be friends with\l" .string "POKéMON.\p" - .string "Because it’s fun to be with POKéMON!$" + .string "Because it's fun to be with POKéMON!$" SootopolisCity_PokemonCenter_1F_Text_22672F: @ 822672F - .string "Aren’t POKéMON our friends?\p" + .string "Aren't POKéMON our friends?\p" .string "Why are they going wild this way?$" diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index d303e0614..12d27a61f 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -9,10 +9,10 @@ SouthernIsland_Exterior_MapScript1_2429CE: @ 82429CE SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 lock faceplayer - msgbox SouthernIsland_Exterior_Text_2A69F1, 5 + msgbox SouthernIsland_Exterior_Text_2A69F1, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq SouthernIsland_Exterior_EventScript_242A17 - msgbox SouthernIsland_Exterior_Text_2A6A5D, 4 + msgbox SouthernIsland_Exterior_Text_2A6A5D, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_2725AA waitmovement 0 @@ -26,7 +26,7 @@ SouthernIsland_Exterior_EventScript_2429D2:: @ 82429D2 end SouthernIsland_Exterior_EventScript_242A17:: @ 8242A17 - msgbox SouthernIsland_Exterior_Text_2A6A82, 4 + msgbox SouthernIsland_Exterior_Text_2A6A82, MSGBOX_DEFAULT release end @@ -50,6 +50,6 @@ BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C - msgbox SouthernIsland_Exterior_Text_2A6AD5, 3 + msgbox SouthernIsland_Exterior_Text_2A6AD5, MSGBOX_SIGN end diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 26bf9d9f9..b21fdecab 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -113,7 +113,7 @@ SouthernIsland_Interior_EventScript_242B8F:: @ 8242B8F end SouthernIsland_Interior_EventScript_242B9A:: @ 8242B9A - msgbox SouthernIsland_Interior_Text_2A6AA1, 4 + msgbox SouthernIsland_Interior_Text_2A6AA1, MSGBOX_DEFAULT releaseall end diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc index ff731393b..e9117efe2 100644 --- a/data/maps/TrainerHill_Elevator/scripts.inc +++ b/data/maps/TrainerHill_Elevator/scripts.inc @@ -23,7 +23,7 @@ TrainerHill_Elevator_EventScript_269375:: @ 8269375 applymovement 1, TrainerHill_Elevator_Movement_2693EE waitmovement 0 lockall - msgbox TrainerHill_Elevator_Text_268F3E, 5 + msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_eq TrainerHill_Elevator_EventScript_269360 releaseall diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 84543ff2b..c75c22be2 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -84,13 +84,13 @@ TrainerHill_Entrance_EventScript_268182:: @ 8268182 TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5 lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268689, 4 + msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_2681DA TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA lockall applymovement 255, TrainerHill_Entrance_Movement_26837F - msgbox TrainerHill_Entrance_Text_268712, 4 + msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA closemessage @@ -118,11 +118,11 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD special sp194_trainer_tower compare VAR_RESULT, 0 goto_eq TrainerHill_Entrance_EventScript_26821F - msgbox TrainerHill_Entrance_Text_2686F4, 4 + msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_268227 TrainerHill_Entrance_EventScript_26821F:: @ 826821F - msgbox TrainerHill_Entrance_Text_2687AC, 4 + msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_268227:: @ 8268227 release @@ -133,7 +133,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 applymovement 255, TrainerHill_Entrance_Movement_26837F checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_26836A - msgbox TrainerHill_Entrance_Text_2684C6, 4 + msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 special sp194_trainer_tower compare VAR_RESULT, 0 @@ -142,11 +142,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 special sp194_trainer_tower compare VAR_RESULT, 1 goto_eq TrainerHill_Entrance_EventScript_268275 - msgbox TrainerHill_Entrance_Text_268564, 4 + msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D TrainerHill_Entrance_EventScript_268275:: @ 8268275 - msgbox TrainerHill_Entrance_Text_26859E, 4 + msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT TrainerHill_Entrance_EventScript_26827D:: @ 826827D message TrainerHill_Entrance_Text_2685F8 @@ -160,7 +160,7 @@ TrainerHill_Entrance_EventScript_26827D:: @ 826827D end TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA - msgbox TrainerHill_Entrance_Text_2687C3, 4 + msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT goto TrainerHill_Entrance_EventScript_26827D end @@ -175,7 +175,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 setvar VAR_0x40D6, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty - msgbox TrainerHill_Entrance_Text_26862A, 4 + msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT setvar VAR_0x8004, 0 special sp194_trainer_tower releaseall @@ -183,7 +183,7 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 TrainerHill_Entrance_EventScript_268314:: @ 8268314 setvar VAR_TEMP_5, 0 - msgbox TrainerHill_Entrance_Text_26866F, 4 + msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -191,7 +191,7 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 end TrainerHill_Entrance_EventScript_26832E:: @ 826832E - msgbox TrainerHill_Entrance_Text_26851C, 4 + msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT setvar VAR_0x8004, 14 special sp194_trainer_tower setvar VAR_TEMP_5, 1 @@ -209,7 +209,7 @@ TrainerHill_Entrance_EventScript_26835C:: @ 826835C end TrainerHill_Entrance_EventScript_26836A:: @ 826836A - msgbox TrainerHill_Entrance_Text_268430, 4 + msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT closemessage applymovement 255, TrainerHill_Entrance_Movement_268381 waitmovement 0 @@ -244,21 +244,21 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388 TrainerHill_Entrance_EventScript_268391:: @ 8268391 checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683A3 - msgbox TrainerHill_Entrance_Text_268D5A, 2 + msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3 - msgbox TrainerHill_Entrance_Text_268DDA, 2 + msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC checkflag FLAG_SYS_GAME_CLEAR goto_if 0, TrainerHill_Entrance_EventScript_2683BE - msgbox TrainerHill_Entrance_Text_268E6A, 2 + msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE - msgbox TrainerHill_Entrance_Text_268EDC, 2 + msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC end TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 @@ -269,7 +269,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7 checkflag FLAG_SYS_GAME_CLEAR goto_eq TrainerHill_Entrance_EventScript_268402 pokemart TrainerHill_Entrance_Pokemart_2683E8 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -292,7 +292,7 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8 TrainerHill_Entrance_EventScript_268402:: @ 8268402 pokemart TrainerHill_Entrance_Pokemart_268414 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -318,7 +318,7 @@ TrainerHill_Entrance_Text_268430: @ 8268430 .string "This is the TRAINER HILL where\n" .string "you may enjoy tag battles with many\l" .string "TRAINERS.\p" - .string "Unfortunately, we’re still getting\n" + .string "Unfortunately, we're still getting\n" .string "things ready. Please come back later!$" TrainerHill_Entrance_Text_2684C6: @ 82684C6 @@ -333,12 +333,12 @@ TrainerHill_Entrance_Text_26851C: @ 826851C .string "your game.$" TrainerHill_Entrance_Text_268564: @ 8268564 - .string "Let’s see…\n" + .string "Let's see…\n" .string "The TRAINERS here now are…\p" .string "Up to floor no. {STR_VAR_1}.$" TrainerHill_Entrance_Text_26859E: @ 826859E - .string "Let’s see…\n" + .string "Let's see…\n" .string "The TRAINERS here now are…\p" .string "There appear to be TRAINERS gathered\n" .string "in every room.$" @@ -371,7 +371,7 @@ TrainerHill_Entrance_Text_268712: @ 8268712 .string "the movement can be hectic.\p" .string "To avoid the stampede, we moved\n" .string "the reception counter here.\p" - .string "I’m sorry for the inconvenience.$" + .string "I'm sorry for the inconvenience.$" TrainerHill_Entrance_Text_2687AC: @ 82687AC .string "Thank you for playing!$" @@ -390,7 +390,7 @@ TrainerHill_Entrance_Text_2687C3: @ 82687C3 .string "be awarded.$" TrainerHill_Entrance_Text_26890D: @ 826890D - .string "Oh, I’m sorry, but you appear to have\n" + .string "Oh, I'm sorry, but you appear to have\n" .string "only one POKéMON with you.\p" .string "You will need at least two POKéMON\n" .string "to enter this event.$" @@ -399,7 +399,7 @@ TrainerHill_Roof_Text_268986: @ 8268986 .string "Hm! Hm!\p" .string "You finally came!\n" .string "Yes, you have arrived!\p" - .string "Wait! Don’t say it!\n" + .string "Wait! Don't say it!\n" .string "I know why you came all the way\l" .string "here by yourself!\p" .string "You wanted to see me, the owner\n" @@ -407,7 +407,7 @@ TrainerHill_Roof_Text_268986: @ 8268986 .string "You want to form a tag team with me!\n" .string "Wa-hoo!\p" .string "…Uh?\n" - .string "That’s not it?\p" + .string "That's not it?\p" .string "Anyway, I watched you on your way up.\n" .string "Marvelous battling! Bravo, indeed!$" @@ -417,19 +417,19 @@ TrainerHill_Roof_Text_268AC5: @ 8268AC5 TrainerHill_Roof_Text_268B07: @ 8268B07 .string "Oh, no, full up with things!\n" - .string "You’ll be back later for this!$" + .string "You'll be back later for this!$" TrainerHill_Roof_Text_268B43: @ 8268B43 .string "Oh, hold on here! Did you possibly get\n" .string "here marvelously quickly?\p" - .string "How splendid! You needn’t have\n" + .string "How splendid! You needn't have\n" .string "hurried so to see me!\p" - .string "That is so delightful. I’ll have the Time\n" + .string "That is so delightful. I'll have the Time\n" .string "Board at the reception updated!$" TrainerHill_Roof_Text_268C03: @ 8268C03 .string "But, oh…\n" - .string "You weren’t very quick getting here.$" + .string "You weren't very quick getting here.$" TrainerHill_Roof_Text_268C31: @ 8268C31 .string "Perhaps it would please me more if you\n" @@ -450,14 +450,14 @@ TrainerHill_Entrance_Text_268D47: @ 8268D47 TrainerHill_Entrance_Text_268D5A: @ 8268D5A .string "Who knows what sort of TRAINERS\n" .string "and POKéMON combos are ahead?\p" - .string "All I know is that I’ll knock aside\n" + .string "All I know is that I'll knock aside\n" .string "anyone that stands in my way!$" TrainerHill_Entrance_Text_268DDA: @ 8268DDA .string "I heard tough TRAINERS come to this\n" .string "TRAINER HILL from all over.\p" - .string "I can’t wait to test the waters!\p" - .string "I’ll knock aside anyone that stands\n" + .string "I can't wait to test the waters!\p" + .string "I'll knock aside anyone that stands\n" .string "in my way!$" TrainerHill_Entrance_Text_268E6A: @ 8268E6A @@ -466,9 +466,9 @@ TrainerHill_Entrance_Text_268E6A: @ 8268E6A .string "can reach the top in the least time.$" TrainerHill_Entrance_Text_268EDC: @ 8268EDC - .string "Do you know when they’re opening\n" + .string "Do you know when they're opening\n" .string "this place up?\p" - .string "I’m waiting here to be the first\n" + .string "I'm waiting here to be the first\n" .string "challenger ever!$" TrainerHill_Elevator_Text_268F3E: @ 8268F3E diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index bdec2f7aa..19e8ef567 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -16,7 +16,7 @@ TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 case 2, TrainerHill_Roof_EventScript_2690A8 TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA - msgbox TrainerHill_Roof_Text_268986, 4 + msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 setvar VAR_0x8004, 2 @@ -27,7 +27,7 @@ TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 case 2, TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269020:: @ 8269020 - msgbox TrainerHill_Roof_Text_268AC5, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT playfanfare MUS_FANFA1 message gUnknown_08272A78 waitfanfare @@ -35,9 +35,9 @@ TrainerHill_Roof_EventScript_269020:: @ 8269020 goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269037:: @ 8269037 - msgbox TrainerHill_Roof_Text_268AC5, 4 - msgbox gUnknown_08272A89, 4 - msgbox TrainerHill_Roof_Text_268B07, 4 + msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT + msgbox gUnknown_08272A89, MSGBOX_DEFAULT + msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_269054 TrainerHill_Roof_EventScript_269054:: @ 8269054 @@ -49,22 +49,22 @@ TrainerHill_Roof_EventScript_269054:: @ 8269054 case 2, TrainerHill_Roof_EventScript_26909E TrainerHill_Roof_EventScript_269082:: @ 8269082 - msgbox TrainerHill_Roof_Text_268B43, 4 + msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_269090:: @ 8269090 - msgbox TrainerHill_Roof_Text_268C03, 4 + msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT goto TrainerHill_Roof_EventScript_26909E end TrainerHill_Roof_EventScript_26909E:: @ 826909E - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end TrainerHill_Roof_EventScript_2690A8:: @ 82690A8 - msgbox TrainerHill_Roof_Text_268C31, 4 + msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT release end diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index ae1d161e0..7cdd3402d 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -39,7 +39,7 @@ Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3 end Underwater_SeafloorCavern_EventScript_2343DC:: @ 82343DC - msgbox Underwater_SeafloorCavern_Text_2343E5, 3 + msgbox Underwater_SeafloorCavern_Text_2343E5, MSGBOX_SIGN end Underwater_SeafloorCavern_Text_2343E5: @ 82343E5 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index 8cc8f6f4d..578881daa 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -12,25 +12,25 @@ VerdanturfTown_EventScript_1EB575:: @ 81EB575 faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB594 - msgbox VerdanturfTown_Text_1EB5FD, 4 + msgbox VerdanturfTown_Text_1EB5FD, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB594:: @ 81EB594 - msgbox VerdanturfTown_Text_1EB6E0, 4 + msgbox VerdanturfTown_Text_1EB6E0, MSGBOX_DEFAULT applymovement 2, VerdanturfTown_Movement_2725A2 waitmovement 0 release end VerdanturfTown_EventScript_1EB5A8:: @ 81EB5A8 - msgbox VerdanturfTown_Text_1EB736, 2 + msgbox VerdanturfTown_Text_1EB736, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5B1:: @ 81EB5B1 - msgbox VerdanturfTown_Text_1EB7E2, 2 + msgbox VerdanturfTown_Text_1EB7E2, MSGBOX_NPC end VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA @@ -38,29 +38,29 @@ VerdanturfTown_EventScript_1EB5BA:: @ 81EB5BA faceplayer checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_EventScript_1EB5CF - msgbox VerdanturfTown_Text_1EB854, 4 + msgbox VerdanturfTown_Text_1EB854, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5CF:: @ 81EB5CF - msgbox VerdanturfTown_Text_1EB935, 4 + msgbox VerdanturfTown_Text_1EB935, MSGBOX_DEFAULT release end VerdanturfTown_EventScript_1EB5D9:: @ 81EB5D9 - msgbox VerdanturfTown_Text_1EB9C4, 3 + msgbox VerdanturfTown_Text_1EB9C4, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5E2:: @ 81EB5E2 - msgbox VerdanturfTown_Text_1EBA11, 3 + msgbox VerdanturfTown_Text_1EBA11, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5EB:: @ 81EB5EB - msgbox VerdanturfTown_Text_1EBA1F, 3 + msgbox VerdanturfTown_Text_1EBA1F, MSGBOX_SIGN end VerdanturfTown_EventScript_1EB5F4:: @ 81EB5F4 - msgbox VerdanturfTown_Text_1EBA59, 3 + msgbox VerdanturfTown_Text_1EBA59, MSGBOX_SIGN end VerdanturfTown_Text_1EB5FD: @ 81EB5FD @@ -71,13 +71,13 @@ VerdanturfTown_Text_1EB5FD: @ 81EB5FD .string "make a big uproar.\p" .string "So they had to stop the big tunnel\n" .string "project.\p" - .string "But there’s one man. He’s trying to dig\n" + .string "But there's one man. He's trying to dig\n" .string "the tunnel by himself!$" VerdanturfTown_Text_1EB6E0: @ 81EB6E0 .string "There was a man who dug a tunnel for\n" .string "a lady he loved.\p" - .string "I don’t really get it, but hey!$" + .string "I don't really get it, but hey!$" VerdanturfTown_Text_1EB736: @ 81EB736 .string "The way the winds blow, volcanic ash\n" @@ -87,7 +87,7 @@ VerdanturfTown_Text_1EB736: @ 81EB736 .string "frail and sickly people.$" VerdanturfTown_Text_1EB7E2: @ 81EB7E2 - .string "My POKéMON and I, we’ve been riding\n" + .string "My POKéMON and I, we've been riding\n" .string "a hot winning streak.\p" .string "So I decided to make my BATTLE TENT\n" .string "debut in this town.$" @@ -95,16 +95,16 @@ VerdanturfTown_Text_1EB7E2: @ 81EB7E2 VerdanturfTown_Text_1EB854: @ 81EB854 .string "Did you see the cave next to the\n" .string "POKéMON MART?\p" - .string "There’s a guy in there who’s trying to\n" + .string "There's a guy in there who's trying to\n" .string "bust up boulders so he can bust out\l" .string "through to the other side.\p" - .string "It’d be great if we could go through…\n" - .string "It’ll make it easy to visit RUSTBORO.$" + .string "It'd be great if we could go through…\n" + .string "It'll make it easy to visit RUSTBORO.$" VerdanturfTown_Text_1EB935: @ 81EB935 .string "That cave next to the POKéMON MART\n" .string "is now a tunnel to the other side.\p" - .string "It’s great--it’s easy to go shop for\n" + .string "It's great--it's easy to go shop for\n" .string "new DEVON products in RUSTBORO now.$" VerdanturfTown_Text_1EB9C4: @ 81EB9C4 @@ -113,7 +113,7 @@ VerdanturfTown_Text_1EB9C4: @ 81EB9C4 .string "sweet fragrance of grass.”$" VerdanturfTown_Text_1EBA11: @ 81EBA11 - .string "WANDA’S HOUSE$" + .string "WANDA'S HOUSE$" VerdanturfTown_Text_1EBA1F: @ 81EBA1F .string "BATTLE TENT VERDANTURF SITE\n" diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 41c8a9502..93b7802be 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F waitmovement 0 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox gStringVar4, 4 + msgbox gStringVar4, MSGBOX_DEFAULT waitmessage call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -80,7 +80,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8 applymovement 3, VerdanturfTown_BattleTentBattleRoom_Movement_2725AA applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6 waitmovement 0 - msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, MSGBOX_DEFAULT special LoadPlayerParty special SavePlayerParty setvar VAR_0x8004, 3 @@ -105,7 +105,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20243C:: @ 820243C case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_2024B8 VerdanturfTown_BattleTentBattleRoom_EventScript_20248A:: @ 820248A - msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, 5 + msgbox VerdanturfTown_BattleTentBattleRoom_Text_250030, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_20243C case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_20251F diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc index a4c2e502c..ef577c7f1 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc @@ -44,7 +44,7 @@ VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 .string "Which CONTEST are you entering?\n" .string "Want a piece of advice?\p" .string "In any CONTEST, for example, a CUTE\n" - .string "CONTEST, I don’t think they judge you\l" + .string "CONTEST, I don't think they judge you\l" .string "only on cuteness in the first round.\p" .string "You need to work out ways for raising\n" .string "POKéMON better.$" @@ -53,13 +53,13 @@ VerdanturfTown_BattleTentCorridor_Text_2021C4: @ 82021C4 .string "I raised my POKéMON to be cute.\p" .string "I found out you can put POKéMON in\n" .string "a CONTEST for cuteness!\p" - .string "I’m so glad I raised my POKéMON with\n" + .string "I'm so glad I raised my POKéMON with\n" .string "loving care…$" VerdanturfTown_BattleTentCorridor_Text_202251: @ 8202251 .string "My POKéMON rules!\p" - .string "It’s cool, tough yet beautiful, cute,\n" - .string "and smart. It’s complete!\p" + .string "It's cool, tough yet beautiful, cute,\n" + .string "and smart. It's complete!\p" .string "I may as well go for wins in every\n" .string "single CONTEST.$" diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 0368859c2..ec7ecfb1a 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -27,7 +27,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201719:: @ 8201719 VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E636, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E636, MSGBOX_DEFAULT closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 @@ -43,7 +43,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201722:: @ 8201722 VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_2C5791 waitmessage setvar VAR_0x8004, 6 @@ -59,7 +59,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201757:: @ 8201757 waitse VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 - msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C57CD, MSGBOX_DEFAULT setvar VAR_0x8004, 7 special sub_81B99B4 switch VAR_RESULT @@ -72,14 +72,14 @@ VerdanturfTown_BattleTentLobby_EventScript_201791:: @ 8201791 waitmessage playfanfare MUS_FANFA4 waitfanfare - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall end VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD - msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E57B, MSGBOX_DEFAULT waitmessage closemessage setvar VAR_TEMP_0, 255 @@ -88,7 +88,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017DD:: @ 82017DD VerdanturfTown_BattleTentLobby_EventScript_2017EE:: @ 82017EE lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5731, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201791 end @@ -105,7 +105,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD special sub_81B99B4 playse SE_SAVE waitse - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT closemessage setvar VAR_TEMP_0, 255 releaseall @@ -113,7 +113,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2017FD:: @ 82017FD VerdanturfTown_BattleTentLobby_EventScript_201837:: @ 8201837 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24E5D8, MSGBOX_DEFAULT message VerdanturfTown_BattleTentLobby_Text_24E5F6 waitmessage setvar VAR_0x8004, 5 @@ -136,7 +136,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873 compare VAR_RESULT, 0 goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE special SavePlayerParty - msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893 message VerdanturfTown_BattleTentLobby_Text_2C5129 @@ -160,7 +160,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF setvar VAR_0x8005, 1 setvar VAR_0x8006, 2 special CallFrontierUtilFunc - msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5633, MSGBOX_DEFAULT fadescreen 1 setvar VAR_0x8004, 1 setvar VAR_0x8005, 3 @@ -168,7 +168,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2018CF:: @ 82018CF waitstate compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A34 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, 5 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5662, MSGBOX_YESNO switch VAR_RESULT case 0, VerdanturfTown_BattleTentLobby_EventScript_201A34 case 1, VerdanturfTown_BattleTentLobby_EventScript_201954 @@ -202,7 +202,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE setvar VAR_0x8004, 3 setvar VAR_0x8005, 3 special CallFrontierUtilFunc - msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C56A2, MSGBOX_DEFAULT closemessage call VerdanturfTown_BattleTentLobby_EventScript_201A41 warp MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR, 255, 2, 7 @@ -211,7 +211,7 @@ VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE end VerdanturfTown_BattleTentLobby_EventScript_2019DB:: @ 82019DB - msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5163, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201893 VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 @@ -220,11 +220,11 @@ VerdanturfTown_BattleTentLobby_EventScript_2019E8:: @ 82019E8 case 1, VerdanturfTown_BattleTentLobby_EventScript_201A10 VerdanturfTown_BattleTentLobby_EventScript_201A03:: @ 8201A03 - msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C543D, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A10:: @ 8201A10 - msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C5538, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201A3F VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D @@ -238,7 +238,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34 special LoadPlayerParty VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37 - msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, MSGBOX_DEFAULT VerdanturfTown_BattleTentLobby_EventScript_201A3F:: @ 8201A3F release @@ -279,27 +279,27 @@ VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B faceplayer checkflag FLAG_0x0EB goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 goto_eq VerdanturfTown_BattleTentLobby_EventScript_272054 setflag FLAG_0x0EB - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AB2:: @ 8201AB2 - msgbox VerdanturfTown_BattleTentLobby_Text_201E43, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201ABC:: @ 8201ABC - msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, 2 + msgbox VerdanturfTown_BattleTentLobby_Text_201EB1, MSGBOX_NPC end VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201BD4, MSGBOX_DEFAULT release end @@ -308,26 +308,26 @@ VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 faceplayer checkflag FLAG_0x1CC goto_eq VerdanturfTown_BattleTentLobby_EventScript_201AED - msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 setflag FLAG_0x1CC release end VerdanturfTown_BattleTentLobby_EventScript_201AED:: @ 8201AED - msgbox VerdanturfTown_BattleTentLobby_Text_202025, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_202025, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201AF7:: @ 8201AF7 lock - msgbox VerdanturfTown_BattleTentLobby_Text_201D11, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_201D11, MSGBOX_DEFAULT release end VerdanturfTown_BattleTentLobby_EventScript_201B02:: @ 8201B02 lockall - msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C6878, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end @@ -349,32 +349,32 @@ VerdanturfTown_BattleTentLobby_EventScript_201B11:: @ 8201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B7E:: @ 8201B7E - msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_2C67CD, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B8C:: @ 8201B8C - msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24EFAB, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201B9A:: @ 8201B9A - msgbox VerdanturfTown_BattleTentLobby_Text_24F049, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F049, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BA8:: @ 8201BA8 - msgbox VerdanturfTown_BattleTentLobby_Text_24F190, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F190, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BB6:: @ 8201BB6 - msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F2E8, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end VerdanturfTown_BattleTentLobby_EventScript_201BC4:: @ 8201BC4 - msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, 4 + msgbox VerdanturfTown_BattleTentLobby_Text_24F3F4, MSGBOX_DEFAULT goto VerdanturfTown_BattleTentLobby_EventScript_201B11 end @@ -383,35 +383,35 @@ VerdanturfTown_BattleTentLobby_EventScript_201BD2:: @ 8201BD2 end VerdanturfTown_BattleTentLobby_Text_201BD4: @ 8201BD4 - .string "If it doesn’t like a certain move,\n" + .string "If it doesn't like a certain move,\n" .string "a POKéMON will be reluctant to use it.\p" - .string "It doesn’t matter how strong it is,\n" + .string "It doesn't matter how strong it is,\n" .string "either.\p" .string "For example, a POKéMON with a GENTLE\n" - .string "nature probably won’t enjoy hurting\l" + .string "nature probably won't enjoy hurting\l" .string "its opponents.\p" - .string "If it can’t seem to live up to its\n" - .string "potential, it’s probably failing at\l" + .string "If it can't seem to live up to its\n" + .string "potential, it's probably failing at\l" .string "using a disliked move against its will.$" VerdanturfTown_BattleTentLobby_Text_201D11: @ 8201D11 .string "My big sister is gentle usually.\n" .string "But when she gets angry,\l" - .string "she’s really, really scary!\p" + .string "she's really, really scary!\p" .string "I bet a gentle POKéMON will be scary\n" .string "if it gets angry!$" VerdanturfTown_BattleTentLobby_Text_201D9E: @ 8201D9E .string "My feelings toward my POKéMON…\n" .string "The attraction runs deep…\p" - .string "Oh, hi, you didn’t see that, did you?\n" - .string "Well, it doesn’t matter.\p" + .string "Oh, hi, you didn't see that, did you?\n" + .string "Well, it doesn't matter.\p" .string "How would you like this TM for\n" .string "your POKéMON?$" VerdanturfTown_BattleTentLobby_Text_201E43: @ 8201E43 .string "My feelings toward my POKéMON…\n" - .string "I’m sure the attraction is mutual!\p" + .string "I'm sure the attraction is mutual!\p" .string "They battle exactly the way I want\n" .string "them to!$" @@ -425,9 +425,9 @@ VerdanturfTown_BattleTentLobby_Text_201EB1: @ 8201EB1 VerdanturfTown_BattleTentLobby_Text_201F3F: @ 8201F3F .string "SCOTT: Hey there, {PLAYER}{KUN}!\n" .string "I thought I might see you here.\p" - .string "A BATTLE TENT’s a place where\n" + .string "A BATTLE TENT's a place where\n" .string "you can meet tough TRAINERS.\p" - .string "It doesn’t matter what the rules are,\n" + .string "It doesn't matter what the rules are,\n" .string "or how battles are waged, either.\p" .string "{PLAYER}{KUN}, I expect you to do\n" .string "the best you can!$" diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index 28030d869..01b1e5030 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -4,7 +4,7 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030 VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 lock faceplayer - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2030ED, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203094 @@ -18,37 +18,37 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_203031:: @ 8203031 end VerdanturfTown_FriendshipRatersHouse_EventScript_203094:: @ 8203094 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2032DF, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_20309E:: @ 820309E - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203288, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030A8:: @ 82030A8 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203249, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030B2:: @ 82030B2 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203213, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030BC:: @ 82030BC - msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_2031D1, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030C6:: @ 82030C6 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203192, MSGBOX_DEFAULT release end VerdanturfTown_FriendshipRatersHouse_EventScript_2030D0:: @ 82030D0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_203141, MSGBOX_DEFAULT release end @@ -57,20 +57,20 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA:: @ 82030DA faceplayer waitse playmoncry SPECIES_PIKACHU, 0 - msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, 4 + msgbox VerdanturfTown_FriendshipRatersHouse_Text_20334A, MSGBOX_DEFAULT waitmoncry release end VerdanturfTown_FriendshipRatersHouse_Text_2030ED: @ 82030ED .string "Let me see your POKéMON.\n" - .string "I’ll check to see how much it likes you.\p" + .string "I'll check to see how much it likes you.\p" .string "Oh.\n" .string "Your POKéMON…$" VerdanturfTown_FriendshipRatersHouse_Text_203141: @ 8203141 .string "It adores you.\n" - .string "It can’t possibly love you any more.\l" + .string "It can't possibly love you any more.\l" .string "I even feel happy seeing it.$" VerdanturfTown_FriendshipRatersHouse_Text_203192: @ 8203192 @@ -82,22 +82,22 @@ VerdanturfTown_FriendshipRatersHouse_Text_2031D1: @ 82031D1 .string "It seems to want to be babied a little.$" VerdanturfTown_FriendshipRatersHouse_Text_203213: @ 8203213 - .string "It’s getting used to you.\n" + .string "It's getting used to you.\n" .string "It seems to believe in you.$" VerdanturfTown_FriendshipRatersHouse_Text_203249: @ 8203249 - .string "It’s not very used to you yet.\n" + .string "It's not very used to you yet.\n" .string "It neither loves nor hates you.$" VerdanturfTown_FriendshipRatersHouse_Text_203288: @ 8203288 - .string "It’s very wary.\n" + .string "It's very wary.\n" .string "It has scary viciousness in its eyes.\l" - .string "It doesn’t like you much at all.$" + .string "It doesn't like you much at all.$" VerdanturfTown_FriendshipRatersHouse_Text_2032DF: @ 82032DF .string "This is a little hard for me to say…\p" .string "Your POKéMON simply detests you.\n" - .string "Doesn’t that make you uncomfortable?$" + .string "Doesn't that make you uncomfortable?$" VerdanturfTown_FriendshipRatersHouse_Text_20334A: @ 820334A .string "PIKACHU: Pika pika!$" diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc index ce48fd662..c6028c784 100644 --- a/data/maps/VerdanturfTown_House/scripts.inc +++ b/data/maps/VerdanturfTown_House/scripts.inc @@ -2,11 +2,11 @@ VerdanturfTown_House_MapScripts:: @ 820335E .byte 0 VerdanturfTown_House_EventScript_20335F:: @ 820335F - msgbox VerdanturfTown_House_Text_203371, 2 + msgbox VerdanturfTown_House_Text_203371, MSGBOX_NPC end VerdanturfTown_House_EventScript_203368:: @ 8203368 - msgbox VerdanturfTown_House_Text_2033EE, 2 + msgbox VerdanturfTown_House_Text_2033EE, MSGBOX_NPC end VerdanturfTown_House_Text_203371: @ 8203371 diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index 96daf2c84..6457aa626 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -7,7 +7,7 @@ VerdanturfTown_Mart_EventScript_202587:: @ 8202587 message gUnknown_08272A21 waitmessage pokemart VerdanturfTown_Mart_Pokemart_2025A0 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -29,27 +29,27 @@ VerdanturfTown_Mart_Pokemart_2025A0: @ 82025A0 end VerdanturfTown_Mart_EventScript_2025BA:: @ 82025BA - msgbox VerdanturfTown_Mart_Text_2025D5, 2 + msgbox VerdanturfTown_Mart_Text_2025D5, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025C3:: @ 82025C3 - msgbox VerdanturfTown_Mart_Text_20264C, 2 + msgbox VerdanturfTown_Mart_Text_20264C, MSGBOX_NPC end VerdanturfTown_Mart_EventScript_2025CC:: @ 82025CC - msgbox VerdanturfTown_Mart_Text_2026C9, 2 + msgbox VerdanturfTown_Mart_Text_2026C9, MSGBOX_NPC end VerdanturfTown_Mart_Text_2025D5: @ 82025D5 .string "For any POKéMON match, X SPECIAL\n" .string "is crucial.\p" .string "It jacks up the power of some moves\n" - .string "even though it’s only for one battle.$" + .string "even though it's only for one battle.$" VerdanturfTown_Mart_Text_20264C: @ 820264C - .string "They don’t seem to sell any winning\n" + .string "They don't seem to sell any winning\n" .string "strategy guides for the BATTLE TENT…\p" - .string "It seems one must rely on one’s\n" + .string "It seems one must rely on one's\n" .string "own wits after all…$" VerdanturfTown_Mart_Text_2026C9: @ 82026C9 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 131df00f7..da8676aec 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -17,16 +17,16 @@ VerdanturfTown_PokemonCenter_1F_EventScript_20273A:: @ 820273A end VerdanturfTown_PokemonCenter_1F_EventScript_202748:: @ 8202748 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20275A, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_EventScript_202751:: @ 8202751 - msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, 2 + msgbox VerdanturfTown_PokemonCenter_1F_Text_20280B, MSGBOX_NPC end VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A - .string "You can’t consider yourself a real\n" - .string "TRAINER if you don’t have faith\l" + .string "You can't consider yourself a real\n" + .string "TRAINER if you don't have faith\l" .string "in your POKéMON.\p" .string "Only those people who can believe\n" .string "in their battling POKéMON can win\l" @@ -35,7 +35,7 @@ VerdanturfTown_PokemonCenter_1F_Text_20275A: @ 820275A VerdanturfTown_PokemonCenter_1F_Text_20280B: @ 820280B .string "The reason why anyone would visit\n" .string "VERDANTURF…\p" - .string "It’s the BATTLE TENT. It goes without\n" + .string "It's the BATTLE TENT. It goes without\n" .string "saying.\p" .string "Or is there somebody here that you\n" .string "came to see?$" diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index 8184f4c21..fea5d3de0 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -6,13 +6,13 @@ VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF faceplayer checkflag FLAG_0x0C1 goto_eq VerdanturfTown_WandasHouse_EventScript_2028D7 - msgbox VerdanturfTown_WandasHouse_Text_202993, 4 + msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT setflag FLAG_0x0C1 release end VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 - msgbox VerdanturfTown_WandasHouse_Text_202ABE, 4 + msgbox VerdanturfTown_WandasHouse_Text_202ABE, MSGBOX_DEFAULT release end @@ -23,22 +23,22 @@ VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 goto_eq VerdanturfTown_WandasHouse_EventScript_202909 checkflag FLAG_0x4F3 goto_eq VerdanturfTown_WandasHouse_EventScript_2028FF - msgbox VerdanturfTown_WandasHouse_Text_202B37, 4 + msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_2028FF:: @ 82028FF - msgbox VerdanturfTown_WandasHouse_Text_202C20, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C20, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202909:: @ 8202909 - msgbox VerdanturfTown_WandasHouse_Text_202C4E, 4 + msgbox VerdanturfTown_WandasHouse_Text_202C4E, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 - msgbox VerdanturfTown_WandasHouse_Text_202E00, 2 + msgbox VerdanturfTown_WandasHouse_Text_202E00, MSGBOX_NPC end VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C @@ -48,17 +48,17 @@ VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C goto_eq VerdanturfTown_WandasHouse_EventScript_202944 checkflag FLAG_0x0BE goto_eq VerdanturfTown_WandasHouse_EventScript_20293A - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20293A:: @ 820293A - msgbox VerdanturfTown_WandasHouse_Text_202CCF, 4 + msgbox VerdanturfTown_WandasHouse_Text_202CCF, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 - msgbox VerdanturfTown_WandasHouse_Text_202D91, 4 + msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -71,78 +71,78 @@ VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E goto_eq VerdanturfTown_WandasHouse_EventScript_20297F checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_eq VerdanturfTown_WandasHouse_EventScript_202975 - msgbox VerdanturfTown_WandasHouse_Text_202E47, 4 + msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202975:: @ 8202975 - msgbox VerdanturfTown_WandasHouse_Text_202F19, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F19, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_20297F:: @ 820297F - msgbox VerdanturfTown_WandasHouse_Text_202F73, 4 + msgbox VerdanturfTown_WandasHouse_Text_202F73, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_EventScript_202989:: @ 8202989 - msgbox VerdanturfTown_WandasHouse_Text_202FDB, 4 + msgbox VerdanturfTown_WandasHouse_Text_202FDB, MSGBOX_DEFAULT release end VerdanturfTown_WandasHouse_Text_202993: @ 8202993 - .string "WALLY: I lost to you, {PLAYER}, but I’m\n" + .string "WALLY: I lost to you, {PLAYER}, but I'm\n" .string "not feeling down anymore.\p" .string "Because I have a new purpose in life.\n" - .string "Together with my RALTS, I’m going\l" + .string "Together with my RALTS, I'm going\l" .string "to challenge POKéMON GYMS and become\l" .string "a great TRAINER.\p" .string "Please watch me, {PLAYER}.\n" - .string "I’m going to be stronger than you.\p" - .string "When I do, I’m going to challenge you\n" + .string "I'm going to be stronger than you.\p" + .string "When I do, I'm going to challenge you\n" .string "to another battle.$" VerdanturfTown_WandasHouse_Text_202ABE: @ 8202ABE .string "WALLY: Please watch me, {PLAYER}.\n" - .string "I’m going to get stronger than you.\p" - .string "When I do, I’m going to challenge you\n" + .string "I'm going to get stronger than you.\p" + .string "When I do, I'm going to challenge you\n" .string "to another battle.$" VerdanturfTown_WandasHouse_Text_202B37: @ 8202B37 .string "UNCLE: Oh! {PLAYER}{KUN}!\n" - .string "WALLY’s next door.\p" - .string "But, boy, there’s something I have to\n" + .string "WALLY's next door.\p" + .string "But, boy, there's something I have to\n" .string "tell you.\p" .string "This natural environment is doing\n" - .string "wonders for WALLY’s health.\p" - .string "Maybe it’s not just the environment.\n" + .string "wonders for WALLY's health.\p" + .string "Maybe it's not just the environment.\n" .string "It could be POKéMON that are giving\l" .string "the boy hope.$" VerdanturfTown_WandasHouse_Text_202C20: @ 8202C20 - .string "WALLY’s gone away…\n" + .string "WALLY's gone away…\n" .string "He slipped off on his own…$" VerdanturfTown_WandasHouse_Text_202C4E: @ 8202C4E .string "UNCLE: Is that right?\n" - .string "WALLY’s gone away that far all by\l" + .string "WALLY's gone away that far all by\l" .string "himself…\p" .string "Well, I have to give him credit--he is\n" - .string "my little brother’s son.$" + .string "my little brother's son.$" VerdanturfTown_WandasHouse_Text_202CCF: @ 8202CCF .string "WANDA: You are?\n" .string "Oh, right, I get it!\p" - .string "You’re the {PLAYER} who WALLY was\n" + .string "You're the {PLAYER} who WALLY was\n" .string "telling me about.\p" - .string "I’m WALLY’s cousin.\n" + .string "I'm WALLY's cousin.\n" .string "Glad to meet you!\p" - .string "I think WALLY’s become a lot more lively\n" + .string "I think WALLY's become a lot more lively\n" .string "and healthy since he came here.$" VerdanturfTown_WandasHouse_Text_202D91: @ 8202D91 - .string "WANDA: Don’t worry about WALLY.\n" - .string "He’ll be just fine.\p" + .string "WANDA: Don't worry about WALLY.\n" + .string "He'll be just fine.\p" .string "I know my little cousin, and he has\n" .string "POKéMON with him, too.$" @@ -152,17 +152,17 @@ VerdanturfTown_WandasHouse_Text_202E00: @ 8202E00 .string "Happy? You bet I am!$" VerdanturfTown_WandasHouse_Text_202E47: @ 8202E47 - .string "My daughter’s boyfriend is a very\n" + .string "My daughter's boyfriend is a very\n" .string "driven and passionate sort of person.\p" - .string "He’s been digging a tunnel nonstop\n" + .string "He's been digging a tunnel nonstop\n" .string "just so he can see my daughter.\p" - .string "My daughter’s a little concerned,\n" + .string "My daughter's a little concerned,\n" .string "so she goes out to the tunnel a lot.$" VerdanturfTown_WandasHouse_Text_202F19: @ 8202F19 - .string "It’s amazing. My daughter’s boyfriend\n" + .string "It's amazing. My daughter's boyfriend\n" .string "was digging the tunnel by hand!\p" - .string "It’s so incredible!$" + .string "It's so incredible!$" VerdanturfTown_WandasHouse_Text_202F73: @ 8202F73 .string "If anything were to happen to WALLY,\n" diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index e32c07684..5b3dabbc9 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -40,9 +40,9 @@ VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8 VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 applymovement 255, VictoryRoad_1F_Movement_2725AA waitmovement 0 - msgbox VictoryRoad_1F_Text_235EE6, 4 - trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_235FFC - msgbox VictoryRoad_1F_Text_236020, 4 + msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC + msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 setflag FLAG_0x07E @@ -78,56 +78,56 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21 step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C - msgbox VictoryRoad_1F_Text_236020, 2 + msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC end VictoryRoad_1F_EventScript_235E35:: @ 8235E35 - trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq VictoryRoad_1F_EventScript_235E5C - msgbox VictoryRoad_1F_Text_2360FE, 6 + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C - trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA - msgbox VictoryRoad_1F_Text_2360FE, 6 + trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA + msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E73:: @ 8235E73 - trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB - msgbox VictoryRoad_1F_Text_2361E5, 6 + trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB + msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A - trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 - msgbox VictoryRoad_1F_Text_2362A4, 6 + trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290 + msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1 - trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 - msgbox VictoryRoad_1F_Text_236356, 6 + trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336 + msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8 - trainerbattle 0, TRAINER_QUINCY, 0, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 - msgbox VictoryRoad_1F_Text_2363D5, 6 + trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4 + msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE end VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF - trainerbattle 0, TRAINER_KATELYNN, 0, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 - msgbox VictoryRoad_1F_Text_2364BB, 6 + trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7 + msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE end VictoryRoad_1F_Text_235EE6: @ 8235EE6 .string "WALLY: Hi! {PLAYER}!\p" - .string "I bet you’re surprised to see me here!\p" - .string "I made it all the way here, and it’s\n" + .string "I bet you're surprised to see me here!\p" + .string "I made it all the way here, and it's\n" .string "all thanks to you!\p" .string "{PLAYER}, losing to you that time\n" .string "made me stronger!\p" - .string "But I’m not going to lose anymore!\p" - .string "I’m going to win! For the POKéMON who\n" + .string "But I'm not going to lose anymore!\p" + .string "I'm going to win! For the POKéMON who\n" .string "gave me courage and strength!\p" .string "Okay… Here I come!$" @@ -136,13 +136,13 @@ VictoryRoad_1F_Text_235FFC: @ 8235FFC .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_236020: @ 8236020 - .string "WALLY: I couldn’t beat you today,\n" - .string "{PLAYER}, but one of these days, I’ll\l" + .string "WALLY: I couldn't beat you today,\n" + .string "{PLAYER}, but one of these days, I'll\l" .string "catch up to you!$" VictoryRoad_1F_Text_236073: @ 8236073 .string "WALLY: Hi! {PLAYER}!\p" - .string "I’ve gotten stronger since that last\n" + .string "I've gotten stronger since that last\n" .string "time! I wanted to show you, {PLAYER}!\p" .string "Okay… Here I come!$" @@ -151,26 +151,26 @@ VictoryRoad_1F_Text_2360DA: @ 82360DA .string "{PLAYER}, you are strong, after all!$" VictoryRoad_1F_Text_2360FE: @ 82360FE - .string "WALLY: I couldn’t beat you this time,\n" + .string "WALLY: I couldn't beat you this time,\n" .string "too… But one of these days, {PLAYER},\l" - .string "I’m going to catch up to you…\p" + .string "I'm going to catch up to you…\p" .string "And challenge the POKéMON LEAGUE!$" VictoryRoad_1F_Text_236184: @ 8236184 - .string "I’ve made it this far a couple times,\n" + .string "I've made it this far a couple times,\n" .string "but the last stretch is so long…$" VictoryRoad_1F_Text_2361CB: @ 82361CB .string "My dream ends here again…$" VictoryRoad_1F_Text_2361E5: @ 82361E5 - .string "You’ve made it this far. Keep the\n" + .string "You've made it this far. Keep the\n" .string "momentum going and become the\l" - .string "CHAMPION! If anyone can, it’s you!$" + .string "CHAMPION! If anyone can, it's you!$" VictoryRoad_1F_Text_236248: @ 8236248 - .string "I didn’t come all this way to lose now.\n" - .string "That possibility doesn’t exist!$" + .string "I didn't come all this way to lose now.\n" + .string "That possibility doesn't exist!$" VictoryRoad_1F_Text_236290: @ 8236290 .string "Impossible…\n" @@ -194,22 +194,22 @@ VictoryRoad_1F_Text_236356: @ 8236356 VictoryRoad_1F_Text_236390: @ 8236390 .string "What is the VICTORY ROAD?\n" - .string "I’ll tell you if you win!$" + .string "I'll tell you if you win!$" VictoryRoad_1F_Text_2363C4: @ 82363C4 .string "Okay!\n" .string "Well done!$" VictoryRoad_1F_Text_2363D5: @ 82363D5 - .string "Getting through here safely--that’s\n" + .string "Getting through here safely--that's\n" .string "the final test for any TRAINER aiming\l" .string "to become the POKéMON CHAMPION.\p" - .string "That’s why it’s called the VICTORY\n" + .string "That's why it's called the VICTORY\n" .string "ROAD.$" VictoryRoad_1F_Text_236468: @ 8236468 .string "I have nothing to say to anyone\n" - .string "that’s come this far. Come on!$" + .string "that's come this far. Come on!$" VictoryRoad_1F_Text_2364A7: @ 82364A7 .string "This is a disgrace…$" @@ -217,4 +217,3 @@ VictoryRoad_1F_Text_2364A7: @ 82364A7 VictoryRoad_1F_Text_2364BB: @ 82364BB .string "Humph, go right on ahead.\n" .string "See if I care.$" - diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index 376fda7d5..c2fb918cc 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,37 +2,37 @@ VictoryRoad_B1F_MapScripts:: @ 82364E4 .byte 0 VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5 - trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD - msgbox VictoryRoad_B1F_Text_2365C4, 6 + trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD + msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC - trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D - msgbox VictoryRoad_B1F_Text_236678, 6 + trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D + msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236513:: @ 8236513 - trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B - msgbox VictoryRoad_B1F_Text_23671B, 6 + trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B + msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_23652A:: @ 823652A - trainerbattle 0, TRAINER_MITCHELL, 0, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 - msgbox VictoryRoad_B1F_Text_2367A7, 6 + trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780 + msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_EventScript_236541:: @ 8236541 - trainerbattle 0, TRAINER_HALLE, 0, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B - msgbox VictoryRoad_B1F_Text_23684C, 6 + trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B + msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE end VictoryRoad_B1F_Text_236558: @ 8236558 - .string "The thought that I’m getting closer to\n" + .string "The thought that I'm getting closer to\n" .string "the POKéMON LEAGUE…\p" - .string "I’m getting stage fright…$" + .string "I'm getting stage fright…$" VictoryRoad_B1F_Text_2365AD: @ 82365AD - .string "I couldn’t do a thing…$" + .string "I couldn't do a thing…$" VictoryRoad_B1F_Text_2365C4: @ 82365C4 .string "The POKéMON LEAGUE became distant\n" @@ -52,14 +52,14 @@ VictoryRoad_B1F_Text_236678: @ 8236678 .string "grows between POKéMON and TRAINERS.$" VictoryRoad_B1F_Text_2366C2: @ 82366C2 - .string "This isn’t the goal. It’s only a place\n" + .string "This isn't the goal. It's only a place\n" .string "on the way to the POKéMON LEAGUE.$" VictoryRoad_B1F_Text_23670B: @ 823670B - .string "That’s the way!$" + .string "That's the way!$" VictoryRoad_B1F_Text_23671B: @ 823671B - .string "You’ll do fine, for sure!\n" + .string "You'll do fine, for sure!\n" .string "Your POKéMON are all eager to go!$" VictoryRoad_B1F_Text_236757: @ 8236757 @@ -67,7 +67,7 @@ VictoryRoad_B1F_Text_236757: @ 8236757 .string "awe inspiring!$" VictoryRoad_B1F_Text_236780: @ 8236780 - .string "I’ve never met anyone like you before.$" + .string "I've never met anyone like you before.$" VictoryRoad_B1F_Text_2367A7: @ 82367A7 .string "Even outside of battle, I sense\n" @@ -76,7 +76,7 @@ VictoryRoad_B1F_Text_2367A7: @ 82367A7 VictoryRoad_B1F_Text_2367FD: @ 82367FD .string "Okay, no need to get your back up!\n" - .string "Relax, let’s take it easy!$" + .string "Relax, let's take it easy!$" VictoryRoad_B1F_Text_23683B: @ 823683B .string "Whoa!\n" @@ -84,8 +84,8 @@ VictoryRoad_B1F_Text_23683B: @ 823683B VictoryRoad_B1F_Text_23684C: @ 823684C .string "Sure, this is VICTORY ROAD.\p" - .string "But it’s not all that different from\n" - .string "the path you’ve taken so far.\p" + .string "But it's not all that different from\n" + .string "the path you've taken so far.\p" .string "Try to enjoy things the rest of\n" .string "the way!$" diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 15deea104..732878de3 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,39 +2,39 @@ VictoryRoad_B2F_MapScripts:: @ 82368D4 .byte 0 VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5 - trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 - msgbox VictoryRoad_B2F_Text_2369DE, 6 + trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3 + msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC - trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 - msgbox VictoryRoad_B2F_Text_236AAE, 6 + trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92 + msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236903:: @ 8236903 - trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 - msgbox VictoryRoad_B2F_Text_236B2F, 6 + trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14 + msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_23691A:: @ 823691A - trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A - msgbox VictoryRoad_B2F_Text_236C21, 6 + trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A + msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236931:: @ 8236931 - trainerbattle 0, TRAINER_FELIX, 0, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB - msgbox VictoryRoad_B2F_Text_236CBA, 6 + trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB + msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_EventScript_236948:: @ 8236948 - trainerbattle 0, TRAINER_DIANNE, 0, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E - msgbox VictoryRoad_B2F_Text_236D8C, 6 + trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E + msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE end VictoryRoad_B2F_Text_23695F: @ 823695F .string "I trained together with my whole family,\n" .string "every one of us!\l" - .string "I’m not losing to anyone!$" + .string "I'm not losing to anyone!$" VictoryRoad_B2F_Text_2369B3: @ 82369B3 .string "Better than my family?!\n" @@ -42,12 +42,12 @@ VictoryRoad_B2F_Text_2369B3: @ 82369B3 VictoryRoad_B2F_Text_2369DE: @ 82369DE .string "I was better than everyone in my\n" - .string "family. I’ve never lost before…\p" - .string "I’ve lost my confidence…\n" - .string "Maybe I’ll go home…$" + .string "family. I've never lost before…\p" + .string "I've lost my confidence…\n" + .string "Maybe I'll go home…$" VictoryRoad_B2F_Text_236A4C: @ 8236A4C - .string "I’d heard that there was a tough\n" + .string "I'd heard that there was a tough\n" .string "little kid around. Do they mean you?$" VictoryRoad_B2F_Text_236A92: @ 8236A92 @@ -69,20 +69,20 @@ VictoryRoad_B2F_Text_236B2F: @ 8236B2F .string "Beware of fatigue!$" VictoryRoad_B2F_Text_236B88: @ 8236B88 - .string "You shouldn’t get complacent just\n" + .string "You shouldn't get complacent just\n" .string "because you have a lot of GYM BADGES.\p" - .string "There’s always going to be someone\n" - .string "who’s better than you!$" + .string "There's always going to be someone\n" + .string "who's better than you!$" VictoryRoad_B2F_Text_236C0A: @ 8236C0A - .string "You’re better than me!$" + .string "You're better than me!$" VictoryRoad_B2F_Text_236C21: @ 8236C21 .string "Gaze on your collected BADGES and\n" - .string "remember the TRAINERS you’ve faced.$" + .string "remember the TRAINERS you've faced.$" VictoryRoad_B2F_Text_236C67: @ 8236C67 - .string "I’ve come this far, but the tension’s\n" + .string "I've come this far, but the tension's\n" .string "giving me awful stomach pain…$" VictoryRoad_B2F_Text_236CAB: @ 8236CAB @@ -90,9 +90,9 @@ VictoryRoad_B2F_Text_236CAB: @ 8236CAB .string "It hurts…$" VictoryRoad_B2F_Text_236CBA: @ 8236CBA - .string "I can’t help getting all tense knowing\n" - .string "that I’m nearing the POKéMON LEAGUE.\p" - .string "It’s all I can do to feign calm.$" + .string "I can't help getting all tense knowing\n" + .string "that I'm nearing the POKéMON LEAGUE.\p" + .string "It's all I can do to feign calm.$" VictoryRoad_B2F_Text_236D27: @ 8236D27 .string "The elite among the elite gather in\n" |