From 4162705db909da94a62f30b5e2caee048b3bc107 Mon Sep 17 00:00:00 2001 From: surskitty Date: Tue, 16 Jan 2018 13:35:33 -0500 Subject: [PATCH] Cooltrainerm Kevin --- maps/Route25.asm | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..903fb205a 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -26,7 +26,7 @@ Route25_MapScriptHeader: .DummyScene1: end -UnknownScript_0x19eea0: +Route25MistyDate1Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 @@ -39,7 +39,7 @@ UnknownScript_0x19eea0: pause 10 applymovement ROUTE25_MISTY, MovementData_0x19efed opentext - writetext UnknownText_0x19f006 + writetext Route25MistyDateText waitbutton closetext spriteface PLAYER, DOWN @@ -52,7 +52,7 @@ UnknownScript_0x19eea0: special RestartMapMusic end -UnknownScript_0x19eee0: +Route25MistyDate2Script: showemote EMOTE_HEART, ROUTE25_MISTY, 15 pause 30 showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10 @@ -65,7 +65,7 @@ UnknownScript_0x19eee0: pause 10 applymovement ROUTE25_MISTY, MovementData_0x19eff4 opentext - writetext UnknownText_0x19f006 + writetext Route25MistyDateText waitbutton closetext spriteface PLAYER, UP @@ -155,32 +155,32 @@ TrainerSupernerdPat: closetext end -CooltrainerMScript_0x19efac: +TrainerCooltrainermKevin: faceplayer opentext checkevent EVENT_BEAT_COOLTRAINERM_KEVIN - iftrue UnknownScript_0x19efda + iftrue .AfterBattle checkevent EVENT_CLEARED_NUGGET_BRIDGE - iftrue UnknownScript_0x19efc7 - writetext UnknownText_0x19f43b + iftrue .AfterNuggetBridge + writetext CooltrainermKevinNuggetText buttonsound verbosegiveitem NUGGET - iffalse UnknownScript_0x19efde + iffalse .NoRoomForNugget setevent EVENT_CLEARED_NUGGET_BRIDGE -UnknownScript_0x19efc7: - writetext UnknownText_0x19f49d +.AfterNuggetBridge: + writetext CooltrainermKevinSeenText waitbutton closetext - winlosstext UnknownText_0x19f4fd, 0 + winlosstext CooltrainermKevinBeatenText, 0 loadtrainer COOLTRAINERM, KEVIN startbattle reloadmapafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN opentext -UnknownScript_0x19efda: - writetext UnknownText_0x19f520 +.AfterBattle: + writetext CooltrainermKevinAfterBattleText waitbutton -UnknownScript_0x19efde: +.NoRoomForNugget: closetext end @@ -238,7 +238,7 @@ MovementData_0x19f000: step LEFT step_end -UnknownText_0x19f006: +Route25MistyDateText: text "MISTY: Aww! Why" line "did you have to" @@ -385,7 +385,7 @@ SupernerdPatAfterBattleText: line "cheat anymore…" done -UnknownText_0x19f43b: +CooltrainermKevinNuggetText: text "You took on one" line "more battle than" @@ -396,7 +396,7 @@ UnknownText_0x19f43b: line "win a prize." done -UnknownText_0x19f49d: +CooltrainermKevinSeenText: text "But after seeing" line "how you battle, I" @@ -407,12 +407,12 @@ UnknownText_0x19f49d: line "me take you on." done -UnknownText_0x19f4fd: +CooltrainermKevinBeatenText: text "I've never had a" line "battle this good!" done -UnknownText_0x19f520: +CooltrainermKevinAfterBattleText: text "That was a great" line "battle!" @@ -440,8 +440,8 @@ Route25_MapEventHeader: .CoordEvents: db 2 - coord_event 42, 6, 1, UnknownScript_0x19eea0 - coord_event 42, 7, 1, UnknownScript_0x19eee0 + coord_event 42, 6, 1, Route25MistyDate1Script + coord_event 42, 7, 1, Route25MistyDate2Script .BGEvents: db 2 @@ -459,5 +459,5 @@ Route25_MapEventHeader: object_event 25, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerCamperLloyd, -1 object_event 28, 11, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassShannon, -1 object_event 31, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerSupernerdPat, -1 - object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x19efac, -1 + object_event 37, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerCooltrainermKevin, -1 object_event 32, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route25Protein, EVENT_ROUTE_25_PROTEIN