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/RusturfTunnel/scripts.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data/maps/RusturfTunnel') diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 86f9c3b2f..bdef05258 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 + msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 - msgbox RusturfTunnel_Text_22D2E1, 4 + 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 @@ -427,7 +427,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB - msgbox RusturfTunnel_Text_22D8F9, 6 + msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE end RusturfTunnel_Text_22D1C8: @ 822D1C8 -- 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/RusturfTunnel/scripts.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/maps/RusturfTunnel') diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index bdef05258..b507c29b4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 faceplayer playbgm MUS_AQA_0, 0 msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT - trainerbattle 3, TRAINER_GRUNT_10, 0, RusturfTunnel_Text_22D2B0 + trainerbattle_no_intro TRAINER_GRUNT_10, RusturfTunnel_Text_22D2B0 msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_GOODS closemessage @@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB msgbox RusturfTunnel_Text_22D8F9, 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/RusturfTunnel/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps/RusturfTunnel') diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index b507c29b4..c93f7d5c4 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -426,7 +426,7 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7 step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 - trainerbattle_normal TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB + trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB msgbox RusturfTunnel_Text_22D8F9, 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/RusturfTunnel/scripts.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/RusturfTunnel') diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index c93f7d5c4..1eaaba66c 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -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!$" -- cgit v1.2.3