ref: 115a5c236d727adec155817626a418c2f66fa498
parent: c167c8161141cf9a73484c9b4be035c2982532a7
author: surskitty <[email protected]>
date: Mon Jan 15 18:23:04 EST 2018
Changing labels to local.
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -25,8 +25,8 @@
closetext
end
-TrainerPokefanmDerek1:
- trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script
+TrainerPokefanmDerek:
+ trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerekSeenText, PokefanmDerekBeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
@@ -33,74 +33,74 @@
end_if_just_battled
opentext
checkflag ENGINE_DEREK_HAS_NUGGET
- iftrue PokefanMDerekHasNugget
+ iftrue .HasNugget
checkcellnum PHONE_POKEFANM_DEREK
- iftrue PokefanMDerekAccepted
+ iftrue .NumberAcceptedM
checkpoke PIKACHU
- iffalse PokefanMDerekWantsPikachu
+ iffalse .WantsPikachu
checkevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
- iftrue PokefanMDerekWantsYourNumber
+ iftrue .AskedAlready
writetext PokefanMDerekText_NotBragging
buttonsound
setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
- scall PokefanMDerekAsksNumber1
- jump PokefanMDerekAsksForPhoneNumber
+ scall .AskNumber1M
+ jump .AskForNumber
-PokefanMDerekWantsYourNumber:
- scall PokefanMDerekAsksNumber2
-PokefanMDerekAsksForPhoneNumber:
+.AskedAlready:
+ scall .AskNumber2M
+.AskForNumber:
askforphonenumber PHONE_POKEFANM_DEREK
- if_equal $1, PokefanMDerekPhoneFull
- if_equal $2, PokefanMDerekDeclined
+ if_equal $1, .PhoneFullM
+ if_equal $2, .NumberDeclinedM
trainertotext POKEFANM, DEREK1, $0
- scall PokefanMDerekRegistered
- jump PokefanMDerekAccepted
+ scall .RegisteredNumberM
+ jump .NumberAcceptedM
-PokefanMDerekHasNugget:
- scall PokefanMDerekGift
+.HasNugget:
+ scall .GiftM
verbosegiveitem NUGGET
iffalse .PackFull
clearflag ENGINE_DEREK_HAS_NUGGET
- jump PokefanMDerekAccepted
+ jump .NumberAcceptedM
.PackFull:
- jump PackIsFull
+ jump .PackFullM
-PokefanMDerekWantsPikachu:
- writetext PokefanMDerekText_PikachuIsIt
+.WantsPikachu:
+ writetext PokefanMDerekPikachuIsItText
waitbutton
closetext
end
-PokefanMDerekAsksNumber1:
+.AskNumber1M:
jumpstd asknumber1m
end
-PokefanMDerekAsksNumber2:
+.AskNumber2M:
jumpstd asknumber2m
end
-PokefanMDerekRegistered:
+.RegisteredNumberM:
jumpstd registerednumberm
end
-PokefanMDerekAccepted:
+.NumberAcceptedM:
jumpstd numberacceptedm
end
-PokefanMDerekDeclined:
+.NumberDeclinedM:
jumpstd numberdeclinedm
end
-PokefanMDerekPhoneFull:
+.PhoneFullM:
jumpstd phonefullm
end
-PokefanMDerekGift:
+.GiftM:
jumpstd giftm
end
-PackIsFull:
+.PackFullM:
jumpstd packfullm
end
@@ -137,17 +137,17 @@
closetext
end
-PokefanFScript_0x1a5bbe:
+TrainerPokefanfJaime:
faceplayer
opentext
checknite
- iffalse UnknownScript_0x1a5be5
+ iffalse .NotNight
checkevent EVENT_BEAT_POKEFANF_JAIME
- iftrue UnknownScript_0x1a5bdf
- writetext UnknownText_0x1a5ee8
+ iftrue .Beaten
+ writetext PokefanfJaimeSeenText
waitbutton
closetext
- winlosstext UnknownText_0x1a5f17, 0
+ winlosstext PokefanfJaimeBeatenText, 0
loadtrainer POKEFANF, JAIME
startbattle
reloadmapafterbattle
@@ -155,14 +155,14 @@
closetext
end
-UnknownScript_0x1a5bdf:
- writetext UnknownText_0x1a5f31
+.Beaten:
+ writetext PokefanfJaimeAfterBattleText
waitbutton
closetext
end
-UnknownScript_0x1a5be5:
- writetext UnknownText_0x1a5ec4
+.NotNight:
+ writetext PokefanfJaimeHopeItGetsDarkText
waitbutton
closetext
end
@@ -209,13 +209,13 @@
cont "voyages."
done
-PokefanmDerek1SeenText:
+PokefanmDerekSeenText:
text "This is a good"
line "time to brag about"
cont "my PIKACHU!"
done
-PokefanmDerek1BeatenText:
+PokefanmDerekBeatenText:
text "I had no time to"
line "show off PIKACHU…"
done
@@ -253,7 +253,7 @@
line "adorable!"
done
-PokefanMDerekText_PikachuIsIt:
+PokefanMDerekPikachuIsItText:
text "PIKACHU is it!"
line "Don't you agree?"
done
@@ -280,12 +280,12 @@
cont "potential."
done
-UnknownText_0x1a5ec4:
+PokefanfJaimeHopeItGetsDarkText:
text "Ufufufu… I hope it"
line "gets dark soon."
done
-UnknownText_0x1a5ee8:
+PokefanfJaimeSeenText:
text "You came at just"
line "the right time."
@@ -292,12 +292,12 @@
para "Let's battle."
done
-UnknownText_0x1a5f17:
+PokefanfJaimeBeatenText:
text "Oh, how disap-"
line "pointing…"
done
-UnknownText_0x1a5f31:
+PokefanfJaimeAfterBattleText:
text "I met my MEOWTH at"
line "night, right here"
cont "on ROUTE 39."
@@ -366,7 +366,7 @@
.ObjectEvents:
db 10
object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
- object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek1, -1
+ object_event 10, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1
object_event 11, 19, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanfRuth, -1
object_event 3, 12, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
object_event 6, 11, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
@@ -374,4 +374,4 @@
object_event 8, 13, SPRITE_TAUROS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route39Miltank, -1
object_event 13, 7, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerPsychicNorman, -1
object_event 9, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a5bf4, -1
- object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokefanFScript_0x1a5bbe, -1
+ object_event 4, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, TrainerPokefanfJaime, -1
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -96,9 +96,9 @@
faceplayer
opentext
checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
- iftrue MonicaMondayScript
+ iftrue .Monday
checkcode VAR_WEEKDAY
- if_not_equal MONDAY, MonicaNotMondayScript
+ if_not_equal MONDAY, .NotMonday
checkevent EVENT_MET_MONICA_OF_MONDAY
iftrue .MetMonica
writetext MeetMonicaText
@@ -108,7 +108,7 @@
writetext MonicaGivesGiftText
buttonsound
verbosegiveitem SHARP_BEAK
- iffalse MonicaDoneScript
+ iffalse .done
setevent EVENT_GOT_SHARP_BEAK_FROM_MONICA
writetext MonicaGaveGiftText
waitbutton
@@ -115,14 +115,14 @@
closetext
end
-MonicaMondayScript:
+.Monday:
writetext MonicaMondayText
waitbutton
-MonicaDoneScript:
+.done:
closetext
end
-MonicaNotMondayScript:
+.NotMonday:
writetext MonicaNotMondayText
waitbutton
closetext