From c557ac61aef788f1630d3960dd2366bf000db8e0 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 03:37:46 -0500 Subject: adds constants, cleans up callstd and msgbox code * adds some constants for standard script names and messagebox types * replaces some callstd calls with msgbox calls where equivalent * replaces msgbox and callstd calls using raw digits with versions that use the constants --- data/maps/Route117/scripts.inc | 68 +++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index eb04664bd..8bb600acc 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -15,27 +15,27 @@ 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 @@ -43,24 +43,24 @@ Route117_EventScript_1F39D0:: @ 81F39D0 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 + msgbox Route117_Text_29C508, MSGBOX_DEFAULT setvar VAR_0x8004, 538 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 538 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3A1B:: @ 81F3A1B trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, 6 + msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A32:: @ 81F3A32 @@ -68,24 +68,24 @@ Route117_EventScript_1F3A32:: @ 81F3A32 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 + msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT setvar VAR_0x8004, 545 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 545 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3A7D:: @ 81F3A7D trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, 6 + msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3A94:: @ 81F3A94 @@ -93,24 +93,24 @@ Route117_EventScript_1F3A94:: @ 81F3A94 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 + msgbox Route117_Text_29C846, MSGBOX_DEFAULT setvar VAR_0x8004, 364 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 364 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3ADF:: @ 81F3ADF trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, 6 + msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3AF6:: @ 81F3AF6 @@ -118,29 +118,29 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 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 + msgbox Route117_Text_29CA32, MSGBOX_DEFAULT setvar VAR_0x8004, 369 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 369 - callstd 8 + callstd STD_REGISTER_MATCH_CALL release end Route117_EventScript_1F3B41:: @ 81F3B41 trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, 6 + 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 + msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3B6F:: @ 81F3B6F @@ -148,22 +148,22 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F 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 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT setvar VAR_0x8004, 287 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 - callstd 8 + callstd STD_REGISTER_MATCH_CALL 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 + msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3BD3:: @ 81F3BD3 @@ -171,37 +171,37 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 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 + msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT setvar VAR_0x8004, 287 special SetMatchCallRegisteredFlag setorcopyvar VAR_0x8000, 287 - callstd 8 + callstd STD_REGISTER_MATCH_CALL 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 + 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 + 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 + 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 + msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end Route117_Text_1F3C7C: @ 81F3C7C -- cgit v1.2.3 From 862265b73a6eab7d070e628d3cb77663543bc368 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 06:04:59 -0500 Subject: defines `register_matchcall` macro --- data/maps/Route117/scripts.inc | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 8bb600acc..12e6651fe 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -51,10 +51,7 @@ Route117_EventScript_1F39FC:: @ 81F39FC special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C508, MSGBOX_DEFAULT - setvar VAR_0x8004, 538 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 538 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ISAAC_1 release end @@ -76,10 +73,7 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT - setvar VAR_0x8004, 545 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 545 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_LYDIA_1 release end @@ -101,10 +95,7 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29C846, MSGBOX_DEFAULT - setvar VAR_0x8004, 364 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 364 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_DYLAN_1 release end @@ -126,10 +117,7 @@ Route117_EventScript_1F3B22:: @ 81F3B22 special sub_80B4808 waitmovement 0 msgbox Route117_Text_29CA32, MSGBOX_DEFAULT - setvar VAR_0x8004, 369 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 369 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_MARIA_1 release end @@ -154,10 +142,7 @@ Route117_EventScript_1F3B6F:: @ 81F3B6F Route117_EventScript_1F3B9F:: @ 81F3B9F msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end @@ -177,10 +162,7 @@ Route117_EventScript_1F3BD3:: @ 81F3BD3 Route117_EventScript_1F3C03:: @ 81F3C03 msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT - setvar VAR_0x8004, 287 - special SetMatchCallRegisteredFlag - setorcopyvar VAR_0x8000, 287 - callstd STD_REGISTER_MATCH_CALL + register_matchcall TRAINER_ANNA_AND_MEG_1 release end -- cgit v1.2.3 From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- data/maps/Route117/scripts.inc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 12e6651fe..05dc75fe7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -39,7 +39,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7 end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + trainerbattle_normal 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 @@ -56,12 +56,12 @@ Route117_EventScript_1F39FC:: @ 81F39FC end Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B + 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_normal 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 @@ -78,12 +78,12 @@ Route117_EventScript_1F3A5E:: @ 81F3A5E end Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E + 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_normal 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 @@ -100,12 +100,12 @@ Route117_EventScript_1F3AC0:: @ 81F3AC0 end Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 + 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_normal 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 @@ -122,17 +122,17 @@ Route117_EventScript_1F3B22:: @ 81F3B22 end Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC + 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 + trainerbattle_normal 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 @@ -147,12 +147,12 @@ Route117_EventScript_1F3B9F:: @ 81F3B9F end Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + 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 @@ -167,22 +167,22 @@ Route117_EventScript_1F3C03:: @ 81F3C03 end Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + 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 + trainerbattle_normal 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 + trainerbattle_normal 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 + trainerbattle_normal TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- data/maps/Route117/scripts.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 05dc75fe7..e80148cd7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -39,7 +39,7 @@ Route117_EventScript_1F39C7:: @ 81F39C7 end Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle_normal TRAINER_ISAAC_1, 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 @@ -61,7 +61,7 @@ Route117_EventScript_1F3A1B:: @ 81F3A1B end Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle_normal TRAINER_LYDIA_1, 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 @@ -83,7 +83,7 @@ Route117_EventScript_1F3A7D:: @ 81F3A7D end Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle_normal TRAINER_DYLAN_1, 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 @@ -105,7 +105,7 @@ Route117_EventScript_1F3ADF:: @ 81F3ADF end Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle_normal TRAINER_MARIA_1, 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 @@ -127,7 +127,7 @@ Route117_EventScript_1F3B41:: @ 81F3B41 end Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle_normal TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 + trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE end @@ -172,17 +172,17 @@ Route117_EventScript_1F3C1C:: @ 81F3C1C end Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle_normal TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 + trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle_normal TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 + trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE end Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle_normal TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 + trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE end -- cgit v1.2.3 From 2615ece23bd9463f3e43fca40eac1adcabeb2813 Mon Sep 17 00:00:00 2001 From: Melody Date: Fri, 7 Dec 2018 10:41:08 -0500 Subject: Use normal apostrophes like adults --- data/maps/Route117/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/Route117') diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index e80148cd7..1dbc7167e 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -189,12 +189,12 @@ Route117_EventScript_1F3C65:: @ 81F3C65 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 -- cgit v1.2.3