ref: 17058aaec275675dd128bdcb65055c2710400b97
parent: 3ed016f9e05356e941d89237ae9d7858d436ba35
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Sun Dec 17 15:45:04 EST 2017
Auto-label more map scripts
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -93,9 +93,9 @@
end
TrainerCooltrainermPaul:
- trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript
+ trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, .Script
-CooltrainermPaulScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermPaulAfterBattleText
@@ -104,9 +104,9 @@
end
TrainerCooltrainermMike:
- trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript
+ trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, .Script
-CooltrainermMikeScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermMikeAfterBattleText
@@ -115,9 +115,9 @@
end
TrainerCooltrainerfLola:
- trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript
+ trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, .Script
-CooltrainerfLolaScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfLolaAfterBattleText
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -61,9 +61,9 @@
jumpstd strengthboulder
TrainerCooltrainermCody:
- trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript
+ trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, .Script
-CooltrainermCodyScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermCodyAfterBattleText
@@ -72,9 +72,9 @@
end
TrainerCooltrainerfFran:
- trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript
+ trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, .Script
-CooltrainerfFranScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfFranAfterBattleText
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -160,8 +160,8 @@
line "a sales clerk."
done
-; possibly unused
-UnknownText_0x1aa25b:
+; unused
+CeladonCityUnusedPokeComCenterText:
text "I love being"
line "surrounded by tall"
cont "buildings!"
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -22,19 +22,19 @@
CeladonDeptStore3FYoungsterScript:
jumptextfaceplayer CeladonDeptStore3FYoungsterText
-GameboyKidScript_0x70d34:
+CeladonDeptStore3FGameboyKid1Script:
faceplayer
opentext
- writetext UnknownText_0x70d86
+ writetext CeladonDeptStore3FGameboyKid1Text
waitbutton
closetext
spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
end
-GameboyKidScript_0x70d3f:
+CeladonDeptStore3FGameboyKid2Script:
faceplayer
opentext
- writetext UnknownText_0x70dc7
+ writetext CeladonDeptStore3FGameboyKid2Text
waitbutton
closetext
spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
@@ -57,7 +57,7 @@
line "on…"
done
-UnknownText_0x70d86:
+CeladonDeptStore3FGameboyKid1Text:
text "Uh-oh! I traded my"
line "#MON without"
@@ -65,7 +65,7 @@
line "GRADE from it."
done
-UnknownText_0x70dc7:
+CeladonDeptStore3FGameboyKid2Text:
text "Yeah! I'm finally"
line "getting a PORYGON!"
@@ -116,6 +116,6 @@
db 5
person_event SPRITE_CLERK, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, ClerkScript_0x70d29, -1
person_event SPRITE_YOUNGSTER, 4, 6, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FYoungsterScript, -1
- person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d34, -1
- person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x70d3f, -1
+ person_event SPRITE_GAMEBOY_KID, 1, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid1Script, -1
+ person_event SPRITE_GAMEBOY_KID, 1, 10, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FGameboyKid2Script, -1
person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -20,7 +20,7 @@
CeladonDeptStore6FYoungsterScript:
jumptextfaceplayer CeladonDeptStore6FYoungsterText
-CeladonVendingMachine:
+CeladonDeptStore6FVendingMachine:
opentext
writetext CeladonVendingText
.Start:
@@ -98,7 +98,8 @@
CeladonDeptStore6FDirectory:
jumptext CeladonDeptStore6FDirectoryText
-UnknownScript_0x7124d:
+; unused
+CeladonDeptStore6FElevatorButton:
jumpstd elevatorbutton
CeladonVendingText:
@@ -162,10 +163,10 @@
db 6
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton
- signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine
- signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine
- signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine
- signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine
+ signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
+ signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
+ signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
+ signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
.PersonEvents:
db 2
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -5,20 +5,19 @@
.MapCallbacks:
db 0
-MapCeladonDeptStoreElevatorSignpost0Script:
+CeladonDeptStoreElevatorScript:
opentext
- elevator Elevator_0x713be
+ elevator CeladonDeptStoreElevatorData
closetext
- iffalse UnknownScript_0x713bd
+ iffalse .Done
pause 5
playsound SFX_ELEVATOR
earthquake 60
waitsfx
-UnknownScript_0x713bd:
+.Done:
end
-
-Elevator_0x713be:
+CeladonDeptStoreElevatorData:
db 6 ; floors
elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F
elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F
@@ -28,7 +27,6 @@
elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end
-
CeladonDeptStoreElevator_MapEventHeader:
; filler
db 0, 0
@@ -35,8 +33,8 @@
.Warps:
db 2
- warp_def $3, $1, 255, CELADON_DEPT_STORE_1F
- warp_def $3, $2, 255, CELADON_DEPT_STORE_1F
+ warp_def $3, $1, -1, CELADON_DEPT_STORE_1F
+ warp_def $3, $2, -1, CELADON_DEPT_STORE_1F
.XYTriggers:
db 0
@@ -43,7 +41,7 @@
.Signposts:
db 1
- signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script
+ signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript
.PersonEvents:
db 0
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -16,62 +16,62 @@
.MapCallbacks:
db 0
-ClerkScript_0x7211d:
+CeladonGameCornerClerkScript:
jumpstd gamecornercoinvendor
CeladonGameCornerReceptionistScript:
jumptextfaceplayer CeladonGameCornerReceptionistText
-PokefanMScript_0x72123:
+CeladonGameCornerPokefanMScript:
faceplayer
opentext
- writetext UnknownText_0x72215
+ writetext CeladonGameCornerPokefanMText
waitbutton
closetext
spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
end
-TeacherScript_0x7212e:
+CeladonGameCornerTeacherScript:
faceplayer
opentext
- writetext UnknownText_0x72242
+ writetext CeladonGameCornerTeacherText
waitbutton
closetext
spriteface CELADONGAMECORNER_TEACHER, RIGHT
end
-FishingGuruScript_0x72139:
+CeladonGameCornerFishingGuruScript:
faceplayer
opentext
- writetext UnknownText_0x72295
+ writetext CeladonGameCornerFishingGuruText
waitbutton
closetext
spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
end
-FisherScript_0x72144:
+CeladonGameCornerFisherScript:
faceplayer
opentext
checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
- iftrue .UnknownScript_0x72169
- writetext UnknownText_0x722dc
+ iftrue .GotCoins
+ writetext CeladonGameCornerFisherText1
buttonsound
checkitem COIN_CASE
- iffalse UnknownScript_0x7217b
+ iffalse .NoCoinCase
checkcoins 9998
- if_equal $0, UnknownScript_0x72184
+ if_equal $0, .FullCoinCase
stringtotext .coinname, $1
- scall .UnknownScript_0x72172
+ scall .GiveCoins
givecoins 18
setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
-.UnknownScript_0x72169:
- writetext UnknownText_0x72345
+.GotCoins:
+ writetext CeladonGameCornerFisherText2
waitbutton
closetext
spriteface LAST_TALKED, LEFT
end
-.UnknownScript_0x72172:
+.GiveCoins:
jumpstd receiveitem
end
@@ -78,15 +78,15 @@
.coinname
db "COIN@"
-UnknownScript_0x7217b:
- writetext UnknownText_0x7238a
+.NoCoinCase:
+ writetext CeladonGameCornerFisherNoCoinCaseText
waitbutton
closetext
spriteface LAST_TALKED, LEFT
end
-UnknownScript_0x72184:
- writetext UnknownText_0x723d9
+.FullCoinCase:
+ writetext CeladonGameCornerFisherFullCoinCaseText
waitbutton
closetext
spriteface LAST_TALKED, LEFT
@@ -95,24 +95,24 @@
CeladonGymGuyScript:
jumptextfaceplayer CeladonGymGuyText
-GrampsScript_0x72190:
+CeladonGameCornerGrampsScript:
faceplayer
opentext
- writetext UnknownText_0x724ad
+ writetext CeladonGameCornerGrampsText
waitbutton
closetext
spriteface CELADONGAMECORNER_GRAMPS, LEFT
end
-MapCeladonGameCornerSignpost36Script:
- jumptext UnknownText_0x724f3
+CeladonGameCornerPoster1Script:
+ jumptext CeladonGameCornerPoster1Text
-MapCeladonGameCornerSignpost37Script:
- jumptext UnknownText_0x72521
+CeladonGameCornerPoster2Script:
+ jumptext CeladonGameCornerPoster2Text
-MapCeladonGameCornerSignpost35Script:
+CeladonGameCornerLuckySlotMachineScript:
random $6
- if_equal $0, MapCeladonGameCornerSignpost16Script
+ if_equal $0, CeladonGameCornerSlotMachineScript
refreshscreen $0
writebyte $0
special Special_SlotMachine
@@ -119,7 +119,7 @@
closetext
end
-MapCeladonGameCornerSignpost16Script:
+CeladonGameCornerSlotMachineScript:
refreshscreen $0
writebyte $1
special Special_SlotMachine
@@ -126,14 +126,14 @@
closetext
end
-MapCeladonGameCornerSignpost11Script:
+CeladonGameCornerCardFlipScript:
refreshscreen $0
special Special_CardFlip
closetext
end
-MapCeladonGameCornerSignpost32Script:
- jumptext UnknownText_0x7254f
+CeladonGameCornerLighterScript:
+ jumptext CeladonGameCornerLighterText
MapCeladonGameCornerSignpost9Script:
opentext
@@ -159,13 +159,13 @@
line "next door."
done
-UnknownText_0x72215:
+CeladonGameCornerPokefanMText:
text "The slot machines"
line "are all state of"
cont "the art."
done
-UnknownText_0x72242:
+CeladonGameCornerTeacherText:
text "It's this machine"
line "I want."
@@ -176,7 +176,7 @@
line "today."
done
-UnknownText_0x72295:
+CeladonGameCornerFishingGuruText:
text "I think this slot"
line "machine will pay"
cont "out…"
@@ -185,7 +185,7 @@
line "among machines."
done
-UnknownText_0x722dc:
+CeladonGameCornerFisherText1:
text "Gahahaha!"
para "The coins just"
@@ -198,7 +198,7 @@
line "with you!"
done
-UnknownText_0x72345:
+CeladonGameCornerFisherText2:
text "Gahahaha!"
para "It makes me feel"
@@ -208,7 +208,7 @@
line "people!"
done
-UnknownText_0x7238a:
+CeladonGameCornerFisherNoCoinCaseText:
text "Hey, you don't"
line "have a COIN CASE."
@@ -217,7 +217,7 @@
cont "coins, kid?"
done
-UnknownText_0x723d9:
+CeladonGameCornerFisherFullCoinCaseText:
text "Hey, your COIN"
line "CASE is full, kid."
@@ -241,7 +241,7 @@
line "enough coins yet…"
done
-UnknownText_0x724ad:
+CeladonGameCornerGrampsText:
text "Hmmm… The odds are"
line "surely better for"
@@ -249,7 +249,7 @@
line "but… What to do?"
done
-UnknownText_0x724f3:
+CeladonGameCornerPoster1Text:
text "Hey!"
para "Underneath this"
@@ -258,7 +258,7 @@
para "There's nothing!"
done
-UnknownText_0x72521:
+CeladonGameCornerPoster2Text:
text "Hey!"
para "Underneath this"
@@ -267,7 +267,7 @@
para "There's nothing!"
done
-UnknownText_0x7254f:
+CeladonGameCornerLighterText:
text "There's a lighter"
line "here."
done
@@ -295,53 +295,53 @@
.Signposts:
db 38
- signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script
- signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
+ signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript
+ signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script
- signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script
- signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script
- signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script
- signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script
- signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script
- signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script
- signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script
- signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script
- signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script
- signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script
- signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script
+ signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
+ signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript
+ signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript
+ signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
+ signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
+ signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
+ signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript
+ signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
+ signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
+ signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script
+ signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script
.PersonEvents:
db 9
- person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, ClerkScript_0x7211d, -1
+ person_event SPRITE_CLERK, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerClerkScript, -1
person_event SPRITE_RECEPTIONIST, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerReceptionistScript, -1
- person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x72123, -1
- person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, TeacherScript_0x7212e, -1
- person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, FishingGuruScript_0x72139, -1
- person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1
- person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x72144, -1
+ person_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerPokefanMScript, -1
+ person_event SPRITE_TEACHER, 7, 17, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeladonGameCornerTeacherScript, -1
+ person_event SPRITE_FISHING_GURU, 7, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
+ person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
+ person_event SPRITE_FISHER, 10, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
person_event SPRITE_GYM_GUY, 3, 11, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
- person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x72190, -1
+ person_event SPRITE_GRAMPS, 8, 2, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1
--- a/maps/CeladonGym.asm
+++ b/maps/CeladonGym.asm
@@ -50,9 +50,9 @@
end
TrainerLassMichelle:
- trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript
+ trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, .Script
-LassMichelleScript:
+.Script:
end_if_just_battled
opentext
writetext LassMichelleAfterBattleText
@@ -61,9 +61,9 @@
end
TrainerPicnickerTanya:
- trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript
+ trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, .Script
-PicnickerTanyaScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerTanyaAfterBattleText
@@ -72,9 +72,9 @@
end
TrainerBeautyJulia:
- trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript
+ trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, .Script
-BeautyJuliaScript:
+.Script:
end_if_just_battled
opentext
writetext BeautyJuliaAfterBattleText
@@ -83,9 +83,9 @@
end
TrainerTwinsJoandzoe1:
- trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script
+ trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script
-TwinsJoandzoe1Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsJoandzoe1AfterBattleText
@@ -94,9 +94,9 @@
end
TrainerTwinsJoandzoe2:
- trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script
+ trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script
-TwinsJoandzoe2Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsJoandzoe2AfterBattleText
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -18,18 +18,18 @@
setflag ENGINE_FLYPOINT_CERULEAN
return
-CooltrainerMScript_0x184009:
+CeruleanCityCooltrainerMScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x184017
- writetext UnknownText_0x1840bc
+ iftrue .ReturnedMachinePart
+ writetext CeruleanCityCooltrainerMText1
waitbutton
closetext
end
-UnknownScript_0x184017:
- writetext UnknownText_0x184144
+.ReturnedMachinePart:
+ writetext CeruleanCityCooltrainerMText2
waitbutton
closetext
end
@@ -45,15 +45,15 @@
closetext
end
-CooltrainerFScript_0x18402a:
+CeruleanCityCooltrainerFScript:
faceplayer
opentext
- writetext UnknownText_0x1841fa
+ writetext CeruleanCityCooltrainerFText1
waitbutton
closetext
spriteface CERULEANCITY_COOLTRAINER_F, LEFT
opentext
- writetext UnknownText_0x184229
+ writetext CeruleanCityCooltrainerFText2
waitbutton
closetext
opentext
@@ -62,41 +62,41 @@
waitbutton
closetext
opentext
- writetext UnknownText_0x18424b
+ writetext CeruleanCityCooltrainerFText3
waitbutton
closetext
end
-FisherScript_0x18404a:
+CeruleanCityFisherScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x184058
+ iftrue .ReturnedMachinePart
checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
- iftrue UnknownScript_0x18405e
-UnknownScript_0x184058:
- writetext UnknownText_0x18424e
+ iftrue .MetCeruleanRocket
+.ReturnedMachinePart:
+ writetext CeruleanCityFisherText
waitbutton
closetext
end
-UnknownScript_0x18405e:
- writetext UnknownText_0x184275
+.MetCeruleanRocket:
+ writetext CeruleanCityFisherRocketTipText
waitbutton
closetext
end
-YoungsterScript_0x184064:
+CeruleanCityYoungsterScript:
faceplayer
opentext
- writetext UnknownText_0x1842a9
+ writetext CeruleanCityYoungsterText1
waitbutton
closetext
checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
- iffalse UnknownScript_0x184072
+ iffalse .BerserkGenePingsItemfinder
end
-UnknownScript_0x184072:
+.BerserkGenePingsItemfinder:
waitsfx
playsound SFX_SECOND_PART_OF_ITEMFINDER
waitsfx
@@ -117,7 +117,7 @@
showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
spriteface CERULEANCITY_YOUNGSTER, LEFT
opentext
- writetext UnknownText_0x1842ee
+ writetext CeruleanCityYoungsterText2
waitbutton
closetext
end
@@ -149,7 +149,7 @@
CeruleanCityHiddenBerserkGene:
dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
-UnknownText_0x1840bc:
+CeruleanCityCooltrainerMText1:
text "KANTO's POWER"
line "PLANT?"
@@ -164,7 +164,7 @@
cont "some sort there."
done
-UnknownText_0x184144:
+CeruleanCityCooltrainerMText2:
text "You're collecting"
line "every single kind"
cont "of #MON?"
@@ -186,34 +186,34 @@
text "SLOWBRO: Yarah?"
done
-UnknownText_0x1841fa:
+CeruleanCityCooltrainerFText1:
text "My SLOWBRO and I"
line "make an awesome"
cont "combination!"
done
-UnknownText_0x184229:
+CeruleanCityCooltrainerFText2:
text "SLOWBRO, show me"
line "your CONFUSION!"
done
-UnknownText_0x18424b:
+CeruleanCityCooltrainerFText3:
text "…"
done
-UnknownText_0x18424e:
+CeruleanCityFisherText:
text "I'm a huge fan of"
line "CERULEAN GYM's"
cont "MISTY."
done
-UnknownText_0x184275:
+CeruleanCityFisherRocketTipText:
text "I saw this shady"
line "guy go off toward"
cont "CERULEAN's CAPE."
done
-UnknownText_0x1842a9:
+CeruleanCityYoungsterText1:
text "There used to be a"
line "cave here that had"
@@ -221,7 +221,7 @@
line "#MON in it."
done
-UnknownText_0x1842ee:
+CeruleanCityYoungsterText2:
text "Ayuh?"
para "My ITEMFINDER is"
@@ -305,9 +305,9 @@
.PersonEvents:
db 6
- person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CooltrainerMScript_0x184009, -1
+ person_event SPRITE_COOLTRAINER_M, 23, 15, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerMScript, -1
person_event SPRITE_SUPER_NERD, 15, 23, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, CeruleanCitySuperNerdScript, -1
person_event SPRITE_SLOWPOKE, 24, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, CeruleanCitySlowbro, -1
- person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CooltrainerFScript_0x18402a, -1
- person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, FisherScript_0x18404a, -1
- person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, YoungsterScript_0x184064, -1
+ person_event SPRITE_COOLTRAINER_F, 24, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, CeruleanCityCooltrainerFScript, -1
+ person_event SPRITE_FISHER, 26, 30, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityFisherScript, -1
+ person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -86,9 +86,9 @@
end
TrainerSwimmerfDiana:
- trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript
+ trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, .Script
-SwimmerfDianaScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfDianaAfterBattleText
@@ -97,9 +97,9 @@
end
TrainerSwimmerfBriana:
- trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript
+ trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, .Script
-SwimmerfBrianaScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfBrianaAfterBattleText
@@ -108,9 +108,9 @@
end
TrainerSwimmermParker:
- trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript
+ trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, .Script
-SwimmermParkerScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermParkerAfterBattleText
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -17,9 +17,9 @@
db 0
TrainerKimono_girlNaoko2:
- trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, Kimono_girlNaoko2Script
+ trainer EVENT_BEAT_KIMONO_GIRL_NAOKO, KIMONO_GIRL, NAOKO2, Kimono_girlNaoko2SeenText, Kimono_girlNaoko2BeatenText, 0, .Script
-Kimono_girlNaoko2Script:
+.Script:
end_if_just_battled
opentext
writetext Kimono_girlNaoko2AfterBattleText
@@ -28,9 +28,9 @@
end
TrainerKimono_girlSayo:
- trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, Kimono_girlSayoScript
+ trainer EVENT_BEAT_KIMONO_GIRL_SAYO, KIMONO_GIRL, SAYO, Kimono_girlSayoSeenText, Kimono_girlSayoBeatenText, 0, .Script
-Kimono_girlSayoScript:
+.Script:
end_if_just_battled
opentext
writetext Kimono_girlSayoAfterBattleText
@@ -39,9 +39,9 @@
end
TrainerKimono_girlZuki:
- trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, Kimono_girlZukiScript
+ trainer EVENT_BEAT_KIMONO_GIRL_ZUKI, KIMONO_GIRL, ZUKI, Kimono_girlZukiSeenText, Kimono_girlZukiBeatenText, 0, .Script
-Kimono_girlZukiScript:
+.Script:
end_if_just_battled
opentext
writetext Kimono_girlZukiAfterBattleText
@@ -50,9 +50,9 @@
end
TrainerKimono_girlKuni:
- trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, Kimono_girlKuniScript
+ trainer EVENT_BEAT_KIMONO_GIRL_KUNI, KIMONO_GIRL, KUNI, Kimono_girlKuniSeenText, Kimono_girlKuniBeatenText, 0, .Script
-Kimono_girlKuniScript:
+.Script:
end_if_just_battled
opentext
writetext Kimono_girlKuniAfterBattleText
@@ -61,9 +61,9 @@
end
TrainerKimono_girlMiki:
- trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, Kimono_girlMikiScript
+ trainer EVENT_BEAT_KIMONO_GIRL_MIKI, KIMONO_GIRL, MIKI, Kimono_girlMikiSeenText, Kimono_girlMikiBeatenText, 0, .Script
-Kimono_girlMikiScript:
+.Script:
end_if_just_battled
opentext
writetext Kimono_girlMikiAfterBattleText
--- a/maps/DarkCaveBlackthornEntrance.asm
+++ b/maps/DarkCaveBlackthornEntrance.asm
@@ -10,20 +10,20 @@
.MapCallbacks:
db 0
-PharmacistScript_0x18c720:
+DarkCaveBlackthornEntrancePharmacistScript:
faceplayer
opentext
checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
- iftrue UnknownScript_0x18c735
- writetext UnknownText_0x18c73f
+ iftrue .GotBlackglasses
+ writetext DarkCaveBlackthornEntrancePharmacistText1
buttonsound
verbosegiveitem BLACKGLASSES
- iffalse UnknownScript_0x18c739
+ iffalse .PackFull
setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
-UnknownScript_0x18c735:
- writetext UnknownText_0x18c80c
+.GotBlackglasses:
+ writetext DarkCaveBlackthornEntrancePharmacistText2
waitbutton
-UnknownScript_0x18c739:
+.PackFull:
closetext
end
@@ -33,7 +33,7 @@
DarkCaveBlackthornEntranceTMSnore:
itemball TM_SNORE
-UnknownText_0x18c73f:
+DarkCaveBlackthornEntrancePharmacistText1:
text "Whoa! You startled"
line "me there!"
@@ -55,7 +55,7 @@
cont "you saw me, OK?"
done
-UnknownText_0x18c80c:
+DarkCaveBlackthornEntrancePharmacistText2:
text "BLACKGLASSES ups"
line "the power of dark-"
cont "type moves."
@@ -78,6 +78,6 @@
.PersonEvents:
db 3
- person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PharmacistScript_0x18c720, -1
+ person_event SPRITE_PHARMACIST, 3, 7, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, DarkCaveBlackthornEntrancePharmacistScript, -1
person_event SPRITE_POKE_BALL, 24, 21, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceRevive, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE
person_event SPRITE_POKE_BALL, 22, 7, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, DarkCaveBlackthornEntranceTMSnore, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -84,9 +84,9 @@
end
TrainerCooltrainermDarin:
- trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, CooltrainermDarinScript
+ trainer EVENT_BEAT_COOLTRAINERM_DARIN, COOLTRAINERM, DARIN, CooltrainermDarinSeenText, CooltrainermDarinBeatenText, 0, .Script
-CooltrainermDarinScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermDarinAfterBattleText
@@ -95,9 +95,9 @@
end
TrainerCooltrainerfCara:
- trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, CooltrainerfCaraScript
+ trainer EVENT_BEAT_COOLTRAINERF_CARA, COOLTRAINERF, CARA, CooltrainerfCaraSeenText, CooltrainerfCaraBeatenText, 0, .Script
-CooltrainerfCaraScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfCaraAfterBattleText
@@ -106,9 +106,9 @@
end
TrainerTwinsLeaandpia1:
- trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, TwinsLeaandpia1Script
+ trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia1SeenText, TwinsLeaandpia1BeatenText, 0, .Script
-TwinsLeaandpia1Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsLeaandpia1AfterBattleText
@@ -117,9 +117,9 @@
end
TrainerTwinsLeaandpia2:
- trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, TwinsLeaandpia2Script
+ trainer EVENT_BEAT_TWINS_LEA_AND_PIA, TWINS, LEAANDPIA1, TwinsLeaandpia2SeenText, TwinsLeaandpia2BeatenText, 0, .Script
-TwinsLeaandpia2Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsLeaandpia2AfterBattleText
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -41,19 +41,19 @@
EarlsPokemonAcademyYoungster1Script:
jumptextfaceplayer EarlsPokemonAcademyYoungster1Text
-GameboyKidScript_0x68a86:
+EarlsPokemonAcademyGameboyKid1Script:
faceplayer
opentext
- writetext UnknownText_0x68dda
+ writetext EarlsPokemonAcademyGameboyKid1Text
waitbutton
closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
end
-GameboyKidScript_0x68a91:
+EarlsPokemonAcademyGameboyKid2Script:
faceplayer
opentext
- writetext UnknownText_0x68e07
+ writetext EarlsPokemonAcademyGameboyKid2Text
waitbutton
closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
@@ -241,13 +241,13 @@
cont "blackboard too."
done
-UnknownText_0x68dda:
+EarlsPokemonAcademyGameboyKid1Text:
text "I traded my best"
line "#MON to the"
cont "guy beside me."
done
-UnknownText_0x68e07:
+EarlsPokemonAcademyGameboyKid2Text:
text "Huh? The #MON I"
line "just got is hold-"
cont "ing something!"
@@ -435,7 +435,7 @@
db 6
person_event SPRITE_FISHER, 2, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL
person_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster1Script, -1
- person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a86, -1
- person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, GameboyKidScript_0x68a91, -1
+ person_event SPRITE_GAMEBOY_KID, 11, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid1Script, -1
+ person_event SPRITE_GAMEBOY_KID, 11, 4, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyGameboyKid2Script, -1
person_event SPRITE_YOUNGSTER, 7, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, EarlsPokemonAcademyYoungster2Script, -1
person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -98,9 +98,9 @@
end
TrainerSageJeffrey:
- trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, SageJeffreyScript
+ trainer EVENT_BEAT_SAGE_JEFFREY, SAGE, JEFFREY, SageJeffreySeenText, SageJeffreyBeatenText, 0, .Script
-SageJeffreyScript:
+.Script:
end_if_just_battled
opentext
writetext SageJeffreyAfterBattleText
@@ -109,9 +109,9 @@
end
TrainerSagePing:
- trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, SagePingScript
+ trainer EVENT_BEAT_SAGE_PING, SAGE, PING, SagePingSeenText, SagePingBeatenText, 0, .Script
-SagePingScript:
+.Script:
end_if_just_battled
opentext
writetext SagePingAfterBattleText
@@ -120,9 +120,9 @@
end
TrainerMediumMartha:
- trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, MediumMarthaScript
+ trainer EVENT_BEAT_MEDIUM_MARTHA, MEDIUM, MARTHA, MediumMarthaSeenText, MediumMarthaBeatenText, 0, .Script
-MediumMarthaScript:
+.Script:
end_if_just_battled
opentext
writetext MediumMarthaAfterBattleText
@@ -131,9 +131,9 @@
end
TrainerMediumGrace:
- trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, MediumGraceScript
+ trainer EVENT_BEAT_MEDIUM_GRACE, MEDIUM, GRACE, MediumGraceSeenText, MediumGraceBeatenText, 0, .Script
-MediumGraceScript:
+.Script:
end_if_just_battled
opentext
writetext MediumGraceAfterBattleText
--- a/maps/FastShipB1F.asm
+++ b/maps/FastShipB1F.asm
@@ -94,9 +94,9 @@
end
TrainerSailorJeff:
- trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, SailorJeffScript
+ trainer EVENT_BEAT_SAILOR_JEFF, SAILOR, JEFF, SailorJeffSeenText, SailorJeffBeatenText, 0, .Script
-SailorJeffScript:
+.Script:
end_if_just_battled
opentext
writetext SailorJeffAfterBattleText
@@ -105,9 +105,9 @@
end
TrainerPicnickerDebra:
- trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, PicnickerDebraScript
+ trainer EVENT_BEAT_PICNICKER_DEBRA, PICNICKER, DEBRA, PicnickerDebraSeenText, PicnickerDebraBeatenText, 0, .Script
-PicnickerDebraScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerDebraAfterBattleText
@@ -116,9 +116,9 @@
end
TrainerJugglerFritz:
- trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, JugglerFritzScript
+ trainer EVENT_BEAT_JUGGLER_FRITZ, JUGGLER, FRITZ, JugglerFritzSeenText, JugglerFritzBeatenText, 0, .Script
-JugglerFritzScript:
+.Script:
end_if_just_battled
opentext
writetext JugglerFritzAfterBattleText
@@ -127,9 +127,9 @@
end
TrainerSailorGarrett:
- trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, SailorGarrettScript
+ trainer EVENT_BEAT_SAILOR_GARRETT, SAILOR, GARRETT, SailorGarrettSeenText, SailorGarrettBeatenText, 0, .Script
-SailorGarrettScript:
+.Script:
end_if_just_battled
opentext
writetext SailorGarrettAfterBattleText
@@ -138,9 +138,9 @@
end
TrainerFisherJonah:
- trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, FisherJonahScript
+ trainer EVENT_BEAT_FISHER_JONAH, FISHER, JONAH, FisherJonahSeenText, FisherJonahBeatenText, 0, .Script
-FisherJonahScript:
+.Script:
end_if_just_battled
opentext
writetext FisherJonahAfterBattleText
@@ -149,9 +149,9 @@
end
TrainerBlackbeltWai:
- trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, BlackbeltWaiScript
+ trainer EVENT_BEAT_BLACKBELT_WAI, BLACKBELT_T, WAI, BlackbeltWaiSeenText, BlackbeltWaiBeatenText, 0, .Script
-BlackbeltWaiScript:
+.Script:
end_if_just_battled
opentext
writetext BlackbeltWaiAfterBattleText
@@ -160,9 +160,9 @@
end
TrainerSailorKenneth:
- trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, SailorKennethScript
+ trainer EVENT_BEAT_SAILOR_KENNETH, SAILOR, KENNETH, SailorKennethSeenText, SailorKennethBeatenText, 0, .Script
-SailorKennethScript:
+.Script:
end_if_just_battled
opentext
writetext SailorKennethAfterBattleText
@@ -171,9 +171,9 @@
end
TrainerTeacherShirley:
- trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, TeacherShirleyScript
+ trainer EVENT_BEAT_TEACHER_SHIRLEY, TEACHER, SHIRLEY, TeacherShirleySeenText, TeacherShirleyBeatenText, 0, .Script
-TeacherShirleyScript:
+.Script:
end_if_just_battled
opentext
writetext TeacherShirleyAfterBattleText
@@ -182,9 +182,9 @@
end
TrainerSchoolboyNate:
- trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, SchoolboyNateScript
+ trainer EVENT_BEAT_SCHOOLBOY_NATE, SCHOOLBOY, NATE, SchoolboyNateSeenText, SchoolboyNateBeatenText, 0, .Script
-SchoolboyNateScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyNateAfterBattleText
@@ -193,9 +193,9 @@
end
TrainerSchoolboyRicky:
- trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, SchoolboyRickyScript
+ trainer EVENT_BEAT_SCHOOLBOY_RICKY, SCHOOLBOY, RICKY, SchoolboyRickySeenText, SchoolboyRickyBeatenText, 0, .Script
-SchoolboyRickyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyRickyAfterBattleText
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -15,9 +15,9 @@
db 0
TrainerCooltrainermSean:
- trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, CooltrainermSeanScript
+ trainer EVENT_BEAT_COOLTRAINERM_SEAN, COOLTRAINERM, SEAN, CooltrainermSeanSeenText, CooltrainermSeanBeatenText, 0, .Script
-CooltrainermSeanScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermSeanAfterBattleText
@@ -26,9 +26,9 @@
end
TrainerCooltrainerfCarol:
- trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, CooltrainerfCarolScript
+ trainer EVENT_BEAT_COOLTRAINERF_CAROL, COOLTRAINERF, CAROL, CooltrainerfCarolSeenText, CooltrainerfCarolBeatenText, 0, .Script
-CooltrainerfCarolScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfCarolAfterBattleText
@@ -37,9 +37,9 @@
end
TrainerPokemaniacEthan:
- trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, PokemaniacEthanScript
+ trainer EVENT_BEAT_POKEMANIAC_ETHAN, POKEMANIAC, ETHAN, PokemaniacEthanSeenText, PokemaniacEthanBeatenText, 0, .Script
-PokemaniacEthanScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacEthanAfterBattleText
@@ -48,9 +48,9 @@
end
TrainerHikerNoland:
- trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, HikerNolandScript
+ trainer EVENT_BEAT_HIKER_NOLAND, HIKER, NOLAND, HikerNolandSeenText, HikerNolandBeatenText, 0, .Script
-HikerNolandScript:
+.Script:
end_if_just_battled
opentext
writetext HikerNolandAfterBattleText
@@ -59,9 +59,9 @@
end
TrainerGentlemanEdward:
- trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, GentlemanEdwardScript
+ trainer EVENT_BEAT_GENTLEMAN_EDWARD, GENTLEMAN, EDWARD, GentlemanEdwardSeenText, GentlemanEdwardBeatenText, 0, .Script
-GentlemanEdwardScript:
+.Script:
end_if_just_battled
opentext
writetext GentlemanEdwardAfterBattleText
@@ -70,9 +70,9 @@
end
TrainerBurglarCorey:
- trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, BurglarCoreyScript
+ trainer EVENT_BEAT_BURGLAR_COREY, BURGLAR, COREY, BurglarCoreySeenText, BurglarCoreyBeatenText, 0, .Script
-BurglarCoreyScript:
+.Script:
end_if_just_battled
opentext
writetext BurglarCoreyAfterBattleText
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -141,9 +141,9 @@
end
TrainerPokefanmColin:
- trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, PokefanmColinScript
+ trainer EVENT_BEAT_POKEFANM_COLIN, POKEFANM, COLIN, PokefanmColinSeenText, PokefanmColinBeatenText, 0, .Script
-PokefanmColinScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmColinAfterBattleText
@@ -152,9 +152,9 @@
end
TrainerTwinsMegandpeg1:
- trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, TwinsMegandpeg1Script
+ trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG1, TwinsMegandpeg1SeenText, TwinsMegandpeg1BeatenText, 0, .Script
-TwinsMegandpeg1Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsMegandpeg1AfterBattleText
@@ -163,9 +163,9 @@
end
TrainerTwinsMegandpeg2:
- trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, TwinsMegandpeg2Script
+ trainer EVENT_BEAT_TWINS_MEG_AND_PEG, TWINS, MEGANDPEG2, TwinsMegandpeg2SeenText, TwinsMegandpeg2BeatenText, 0, .Script
-TwinsMegandpeg2Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsMegandpeg2AfterBattleText
@@ -174,9 +174,9 @@
end
TrainerPsychicRodney:
- trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, PsychicRodneyScript
+ trainer EVENT_BEAT_PSYCHIC_RODNEY, PSYCHIC_T, RODNEY, PsychicRodneySeenText, PsychicRodneyBeatenText, 0, .Script
-PsychicRodneyScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicRodneyAfterBattleText
@@ -185,9 +185,9 @@
end
TrainerPokefanmJeremy:
- trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, PokefanmJeremyScript
+ trainer EVENT_BEAT_POKEFANM_JEREMY, POKEFANM, JEREMY, PokefanmJeremySeenText, PokefanmJeremyBeatenText, 0, .Script
-PokefanmJeremyScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmJeremyAfterBattleText
@@ -196,9 +196,9 @@
end
TrainerPokefanfGeorgia:
- trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, PokefanfGeorgiaScript
+ trainer EVENT_BEAT_POKEFANF_GEORGIA, POKEFANF, GEORGIA, PokefanfGeorgiaSeenText, PokefanfGeorgiaBeatenText, 0, .Script
-PokefanfGeorgiaScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanfGeorgiaAfterBattleText
@@ -207,9 +207,9 @@
end
TrainerSupernerdShawn:
- trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, SupernerdShawnScript
+ trainer EVENT_BEAT_SUPER_NERD_SHAWN, SUPER_NERD, SHAWN, SupernerdShawnSeenText, SupernerdShawnBeatenText, 0, .Script
-SupernerdShawnScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdShawnAfterBattleText
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -12,9 +12,9 @@
db 0
TrainerFirebreatherLyle:
- trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, FirebreatherLyleScript
+ trainer EVENT_BEAT_FIREBREATHER_LYLE, FIREBREATHER, LYLE, FirebreatherLyleSeenText, FirebreatherLyleBeatenText, 0, .Script
-FirebreatherLyleScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherLyleAfterBattleText
@@ -23,9 +23,9 @@
end
TrainerBug_catcherKen:
- trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, Bug_catcherKenScript
+ trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script
-Bug_catcherKenScript:
+.Script:
end_if_just_battled
opentext
writetext Bug_catcherKenAfterBattleText
@@ -34,9 +34,9 @@
end
TrainerBeautyCassie:
- trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, BeautyCassieScript
+ trainer EVENT_BEAT_BEAUTY_CASSIE, BEAUTY, CASSIE, BeautyCassieSeenText, BeautyCassieBeatenText, 0, .Script
-BeautyCassieScript:
+.Script:
end_if_just_battled
opentext
writetext BeautyCassieAfterBattleText
@@ -45,9 +45,9 @@
end
TrainerGuitaristClyde:
- trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, GuitaristClydeScript
+ trainer EVENT_BEAT_GUITARIST_CLYDE, GUITARIST, CLYDE, GuitaristClydeSeenText, GuitaristClydeBeatenText, 0, .Script
-GuitaristClydeScript:
+.Script:
end_if_just_battled
special Mobile_DummyReturnFalse
iftrue .mobile
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -62,8 +62,8 @@
.Warps:
db 2
- warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F
- warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F
+ warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F
+ warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F
.XYTriggers:
db 0
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -93,9 +93,9 @@
jumpstd radiotowerrockets
TrainerLassCarrie:
- trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript
+ trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script
-LassCarrieScript:
+.Script:
end_if_just_battled
opentext
writetext LassCarrieAfterBattleText
@@ -117,9 +117,9 @@
end
TrainerLassBridget:
- trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript
+ trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script
-LassBridgetScript:
+.Script:
end_if_just_battled
opentext
writetext LassBridgetAfterBattleText
@@ -128,9 +128,9 @@
end
TrainerBeautyVictoria:
- trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript
+ trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script
-BeautyVictoriaScript:
+.Script:
end_if_just_battled
opentext
writetext BeautyVictoriaAfterBattleText
@@ -139,9 +139,9 @@
end
TrainerBeautySamantha:
- trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript
+ trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script
-BeautySamanthaScript:
+.Script:
end_if_just_battled
opentext
writetext BeautySamanthaAfterBattleText
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -388,9 +388,9 @@
end
TrainerBug_catcherWayne:
- trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, Bug_catcherWayneScript
+ trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script
-Bug_catcherWayneScript:
+.Script:
end_if_just_battled
opentext
writetext Bug_catcherWayneAfterBattleText
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -146,9 +146,9 @@
end
TrainerFisherAndre:
- trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, FisherAndreScript
+ trainer EVENT_BEAT_FISHER_ANDRE, FISHER, ANDRE, FisherAndreSeenText, FisherAndreBeatenText, 0, .Script
-FisherAndreScript:
+.Script:
end_if_just_battled
opentext
writetext FisherAndreAfterBattleText
@@ -157,9 +157,9 @@
end
TrainerFisherRaymond:
- trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, FisherRaymondScript
+ trainer EVENT_BEAT_FISHER_RAYMOND, FISHER, RAYMOND, FisherRaymondSeenText, FisherRaymondBeatenText, 0, .Script
-FisherRaymondScript:
+.Script:
end_if_just_battled
opentext
writetext FisherRaymondAfterBattleText
@@ -168,9 +168,9 @@
end
TrainerCooltrainermAaron:
- trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, CooltrainermAaronScript
+ trainer EVENT_BEAT_COOLTRAINERM_AARON, COOLTRAINERM, AARON, CooltrainermAaronSeenText, CooltrainermAaronBeatenText, 0, .Script
-CooltrainermAaronScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermAaronAfterBattleText
@@ -179,9 +179,9 @@
end
TrainerCooltrainerfLois:
- trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, CooltrainerfLoisScript
+ trainer EVENT_BEAT_COOLTRAINERF_LOIS, COOLTRAINERF, LOIS, CooltrainerfLoisSeenText, CooltrainerfLoisBeatenText, 0, .Script
-CooltrainerfLoisScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfLoisAfterBattleText
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -71,9 +71,9 @@
jumpstd radiotowerrockets
TrainerSkierRoxanne:
- trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, SkierRoxanneScript
+ trainer EVENT_BEAT_SKIER_ROXANNE, SKIER, ROXANNE, SkierRoxanneSeenText, SkierRoxanneBeatenText, 0, .Script
-SkierRoxanneScript:
+.Script:
end_if_just_battled
opentext
writetext SkierRoxanneAfterBattleText
@@ -82,9 +82,9 @@
end
TrainerSkierClarissa:
- trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, SkierClarissaScript
+ trainer EVENT_BEAT_SKIER_CLARISSA, SKIER, CLARISSA, SkierClarissaSeenText, SkierClarissaBeatenText, 0, .Script
-SkierClarissaScript:
+.Script:
end_if_just_battled
opentext
writetext SkierClarissaAfterBattleText
@@ -93,9 +93,9 @@
end
TrainerBoarderRonald:
- trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, BoarderRonaldScript
+ trainer EVENT_BEAT_BOARDER_RONALD, BOARDER, RONALD, BoarderRonaldSeenText, BoarderRonaldBeatenText, 0, .Script
-BoarderRonaldScript:
+.Script:
end_if_just_battled
opentext
writetext BoarderRonaldAfterBattleText
@@ -104,9 +104,9 @@
end
TrainerBoarderBrad:
- trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, BoarderBradScript
+ trainer EVENT_BEAT_BOARDER_BRAD, BOARDER, BRAD, BoarderBradSeenText, BoarderBradBeatenText, 0, .Script
-BoarderBradScript:
+.Script:
end_if_just_battled
opentext
writetext BoarderBradAfterBattleText
@@ -115,9 +115,9 @@
end
TrainerBoarderDouglas:
- trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, BoarderDouglasScript
+ trainer EVENT_BEAT_BOARDER_DOUGLAS, BOARDER, DOUGLAS, BoarderDouglasSeenText, BoarderDouglasBeatenText, 0, .Script
-BoarderDouglasScript:
+.Script:
end_if_just_battled
opentext
writetext BoarderDouglasAfterBattleText
--- a/maps/MountMortar1FInside.asm
+++ b/maps/MountMortar1FInside.asm
@@ -18,9 +18,9 @@
db 0
TrainerPokemaniacMiller:
- trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, PokemaniacMillerScript
+ trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, 0, .Script
-PokemaniacMillerScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacMillerAfterBattleText
@@ -29,9 +29,9 @@
end
TrainerSupernerdMarkus:
- trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, SupernerdMarkusScript
+ trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, 0, .Script
-SupernerdMarkusScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdMarkusAfterBattleText
--- a/maps/MountMortar2FInside.asm
+++ b/maps/MountMortar2FInside.asm
@@ -15,9 +15,9 @@
db 0
TrainerSupernerdHugh:
- trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, SupernerdHughScript
+ trainer EVENT_BEAT_SUPER_NERD_HUGH, SUPER_NERD, HUGH, SupernerdHughSeenText, SupernerdHughBeatenText, 0, .Script
-SupernerdHughScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdHughAfterBattleText
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -72,9 +72,9 @@
end
TrainerSchoolboyJack1:
- trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, SchoolboyJack1Script
+ trainer EVENT_BEAT_SCHOOLBOY_JACK, SCHOOLBOY, JACK1, SchoolboyJack1SeenText, SchoolboyJack1BeatenText, 0, .Script
-SchoolboyJack1Script:
+.Script:
writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK
end_if_just_battled
opentext
@@ -189,9 +189,9 @@
end
TrainerPokefanmWilliam:
- trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, PokefanmWilliamScript
+ trainer EVENT_BEAT_POKEFANM_WILLIAM, POKEFANM, WILLIAM, PokefanmWilliamSeenText, PokefanmWilliamBeatenText, 0, .Script
-PokefanmWilliamScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmWilliamAfterBattleText
@@ -200,9 +200,9 @@
end
TrainerPokefanfBeverly1:
- trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, PokefanfBeverly1Script
+ trainer EVENT_BEAT_POKEFANF_BEVERLY, POKEFANF, BEVERLY1, PokefanfBeverly1SeenText, PokefanfBeverly1BeatenText, 0, .Script
-PokefanfBeverly1Script:
+.Script:
writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY
end_if_just_battled
opentext
@@ -279,9 +279,9 @@
end
TrainerLassKrise:
- trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, LassKriseScript
+ trainer EVENT_BEAT_LASS_KRISE, LASS, KRISE, LassKriseSeenText, LassKriseBeatenText, 0, .Script
-LassKriseScript:
+.Script:
end_if_just_battled
opentext
writetext LassKriseAfterBattleText
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -10,9 +10,9 @@
db 0
TrainerGentlemanAlfred:
- trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, GentlemanAlfredScript
+ trainer EVENT_BEAT_GENTLEMAN_ALFRED, GENTLEMAN, ALFRED, GentlemanAlfredSeenText, GentlemanAlfredBeatenText, 0, .Script
-GentlemanAlfredScript:
+.Script:
end_if_just_battled
opentext
writetext GentlemanAlfredAfterBattleText
@@ -21,9 +21,9 @@
end
TrainerSailorHuey1:
- trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, SailorHuey1Script
+ trainer EVENT_BEAT_SAILOR_HUEY, SAILOR, HUEY1, SailorHuey1SeenText, SailorHuey1BeatenText, 0, .Script
-SailorHuey1Script:
+.Script:
writecode VAR_CALLERID, PHONE_SAILOR_HUEY
end_if_just_battled
opentext
--- a/maps/OlivineLighthouse3F.asm
+++ b/maps/OlivineLighthouse3F.asm
@@ -12,9 +12,9 @@
db 0
TrainerBird_keeperTheo:
- trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, Bird_keeperTheoScript
+ trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script
-Bird_keeperTheoScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperTheoAfterBattleText
@@ -23,9 +23,9 @@
end
TrainerGentlemanPreston:
- trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, GentlemanPrestonScript
+ trainer EVENT_BEAT_GENTLEMAN_PRESTON, GENTLEMAN, PRESTON, GentlemanPrestonSeenText, GentlemanPrestonBeatenText, 0, .Script
-GentlemanPrestonScript:
+.Script:
end_if_just_battled
opentext
writetext GentlemanPrestonAfterBattleText
@@ -34,9 +34,9 @@
end
TrainerSailorTerrell:
- trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, SailorTerrellScript
+ trainer EVENT_BEAT_SAILOR_TERRELL, SAILOR, TERRELL, SailorTerrellSeenText, SailorTerrellBeatenText, 0, .Script
-SailorTerrellScript:
+.Script:
end_if_just_battled
opentext
writetext SailorTerrellAfterBattleText
--- a/maps/OlivineLighthouse4F.asm
+++ b/maps/OlivineLighthouse4F.asm
@@ -10,9 +10,9 @@
db 0
TrainerLassConnie:
- trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, LassConnie1Script
+ trainer EVENT_BEAT_LASS_CONNIE, LASS, CONNIE1, LassConnie1SeenText, LassConnie1BeatenText, 0, .Script
-LassConnie1Script:
+.Script:
end_if_just_battled
opentext
writetext LassConnie1AfterBattleText
@@ -21,9 +21,9 @@
end
TrainerSailorKent:
- trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, SailorKentScript
+ trainer EVENT_BEAT_SAILOR_KENT, SAILOR, KENT, SailorKentSeenText, SailorKentBeatenText, 0, .Script
-SailorKentScript:
+.Script:
end_if_just_battled
opentext
writetext SailorKentAfterBattleText
--- a/maps/OlivineLighthouse5F.asm
+++ b/maps/OlivineLighthouse5F.asm
@@ -13,9 +13,9 @@
db 0
TrainerBird_keeperDenis:
- trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, Bird_keeperDenisScript
+ trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script
-Bird_keeperDenisScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperDenisAfterBattleText
@@ -24,9 +24,9 @@
end
TrainerSailorErnest:
- trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, SailorErnestScript
+ trainer EVENT_BEAT_SAILOR_ERNEST, SAILOR, ERNEST, SailorErnestSeenText, SailorErnestBeatenText, 0, .Script
-SailorErnestScript:
+.Script:
end_if_just_battled
opentext
writetext SailorErnestAfterBattleText
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -41,9 +41,9 @@
end
TrainerCamperJerry:
- trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, CamperJerryScript
+ trainer EVENT_BEAT_CAMPER_JERRY, CAMPER, JERRY, CamperJerrySeenText, CamperJerryBeatenText, 0, .Script
-CamperJerryScript:
+.Script:
end_if_just_battled
opentext
writetext CamperJerryAfterBattleText
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -186,9 +186,9 @@
jumptextfaceplayer RadioTower1FYoungsterText
TrainerGruntM3:
- trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, GruntM3Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_3, GRUNTM, GRUNTM_3, GruntM3SeenText, GruntM3BeatenText, 0, .Script
-GruntM3Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM3AfterBattleText
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -55,9 +55,9 @@
jumptextfaceplayer RadioTower2FBlackBelt2Text
TrainerGruntM4:
- trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, GruntM4Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_4, GRUNTM, GRUNTM_4, GruntM4SeenText, GruntM4BeatenText, 0, .Script
-GruntM4Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM4AfterBattleText
@@ -66,9 +66,9 @@
end
TrainerGruntM5:
- trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, GruntM5Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_5, GRUNTM, GRUNTM_5, GruntM5SeenText, GruntM5BeatenText, 0, .Script
-GruntM5Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM5AfterBattleText
@@ -77,9 +77,9 @@
end
TrainerGruntM6:
- trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, GruntM6Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_6, GRUNTM, GRUNTM_6, GruntM6SeenText, GruntM6BeatenText, 0, .Script
-GruntM6Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM6AfterBattleText
@@ -88,9 +88,9 @@
end
TrainerGruntF2:
- trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, GruntF2Script
+ trainer EVENT_BEAT_ROCKET_GRUNTF_2, GRUNTF, GRUNTF_2, GruntF2SeenText, GruntF2BeatenText, 0, .Script
-GruntF2Script:
+.Script:
end_if_just_battled
opentext
writetext GruntF2AfterBattleText
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -83,9 +83,9 @@
end
TrainerGruntM7:
- trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, GruntM7Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_7, GRUNTM, GRUNTM_7, GruntM7SeenText, GruntM7BeatenText, 0, .Script
-GruntM7Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM7AfterBattleText
@@ -94,9 +94,9 @@
end
TrainerGruntM8:
- trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, GruntM8Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_8, GRUNTM, GRUNTM_8, GruntM8SeenText, GruntM8BeatenText, 0, .Script
-GruntM8Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM8AfterBattleText
@@ -105,9 +105,9 @@
end
TrainerGruntM9:
- trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, GruntM9Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_9, GRUNTM, GRUNTM_9, GruntM9SeenText, GruntM9BeatenText, 0, .Script
-GruntM9Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM9AfterBattleText
@@ -116,9 +116,9 @@
end
TrainerScientistMarc:
- trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, ScientistMarcScript
+ trainer EVENT_BEAT_SCIENTIST_MARC, SCIENTIST, MARC, ScientistMarcSeenText, ScientistMarcBeatenText, 0, .Script
-ScientistMarcScript:
+.Script:
end_if_just_battled
opentext
writetext ScientistMarcAfterBattleText
--- a/maps/RadioTower4F.asm
+++ b/maps/RadioTower4F.asm
@@ -56,9 +56,9 @@
end
TrainerGruntM10:
- trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, GruntM10Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_10, GRUNTM, GRUNTM_10, GruntM10SeenText, GruntM10BeatenText, 0, .Script
-GruntM10Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM10AfterBattleText
@@ -67,9 +67,9 @@
end
TrainerExecutivem2:
- trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, Executivem2Script
+ trainer EVENT_BEAT_ROCKET_EXECUTIVEM_2, EXECUTIVEM, EXECUTIVEM_2, Executivem2SeenText, Executivem2BeatenText, 0, .Script
-Executivem2Script:
+.Script:
end_if_just_battled
opentext
writetext Executivem2AfterBattleText
@@ -78,9 +78,9 @@
end
TrainerGruntF4:
- trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, GruntF4Script
+ trainer EVENT_BEAT_ROCKET_GRUNTF_4, GRUNTF, GRUNTF_4, GruntF4SeenText, GruntF4BeatenText, 0, .Script
-GruntF4Script:
+.Script:
end_if_just_battled
opentext
writetext GruntF4AfterBattleText
@@ -89,9 +89,9 @@
end
TrainerScientistRich:
- trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, ScientistRichScript
+ trainer EVENT_BEAT_SCIENTIST_RICH, SCIENTIST, RICH, ScientistRichSeenText, ScientistRichBeatenText, 0, .Script
-ScientistRichScript:
+.Script:
end_if_just_battled
opentext
writetext ScientistRichAfterBattleText
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -68,9 +68,9 @@
end
TrainerExecutivef1:
- trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, Executivef1Script
+ trainer EVENT_BEAT_ROCKET_EXECUTIVEF_1, EXECUTIVEF, EXECUTIVEF_1, Executivef1SeenText, Executivef1BeatenText, 0, .Script
-Executivef1Script:
+.Script:
end_if_just_battled
opentext
writetext Executivef1AfterBattleText
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -5,13 +5,13 @@
.MapCallbacks:
db 0
-MapRedsHouse2FSignpost0Script:
- jumptext UnknownText_0x19b050
+RedsHouse2FN64Script:
+ jumptext RedsHouse2FN64Text
-MapRedsHouse2FSignpost1Script:
- jumptext UnknownText_0x19b087
+RedsHouse2FPCScript:
+ jumptext RedsHouse2FPCText
-UnknownText_0x19b050:
+RedsHouse2FN64Text:
text "<PLAYER> played the"
line "N64."
@@ -19,7 +19,7 @@
line "no time to lose!"
done
-UnknownText_0x19b087:
+RedsHouse2FPCText:
text "It looks like it"
line "hasn't been used"
cont "in a long time…"
@@ -38,8 +38,8 @@
.Signposts:
db 2
- signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script
- signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script
+ signpost 5, 3, SIGNPOST_READ, RedsHouse2FN64Script
+ signpost 1, 0, SIGNPOST_READ, RedsHouse2FPCScript
.PersonEvents:
db 0
--- a/maps/Route1.asm
+++ b/maps/Route1.asm
@@ -11,9 +11,9 @@
db 0
TrainerSchoolboyDanny:
- trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript
+ trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script
-SchoolboyDannyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyDannyAfterBattleText
@@ -22,9 +22,9 @@
end
TrainerCooltrainerfQuinn:
- trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript
+ trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script
-CooltrainerfQuinnScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfQuinnAfterBattleText
--- a/maps/Route10South.asm
+++ b/maps/Route10South.asm
@@ -10,9 +10,9 @@
db 0
TrainerHikerJim:
- trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, HikerJimScript
+ trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, 0, .Script
-HikerJimScript:
+.Script:
end_if_just_battled
opentext
writetext HikerJimAfterBattleText
@@ -21,9 +21,9 @@
end
TrainerPokefanmRobert:
- trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, PokefanmRobertScript
+ trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, 0, .Script
-PokefanmRobertScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmRobertAfterBattleText
--- a/maps/Route11.asm
+++ b/maps/Route11.asm
@@ -13,9 +13,9 @@
db 0
TrainerYoungsterOwen:
- trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, YoungsterOwenScript
+ trainer EVENT_BEAT_YOUNGSTER_OWEN, YOUNGSTER, OWEN, YoungsterOwenSeenText, YoungsterOwenBeatenText, 0, .Script
-YoungsterOwenScript:
+.Script:
end_if_just_battled
opentext
writetext YoungsterOwenAfterBattleText
@@ -24,9 +24,9 @@
end
TrainerYoungsterJason:
- trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, YoungsterJasonScript
+ trainer EVENT_BEAT_YOUNGSTER_JASON, YOUNGSTER, JASON, YoungsterJasonSeenText, YoungsterJasonBeatenText, 0, .Script
-YoungsterJasonScript:
+.Script:
end_if_just_battled
opentext
writetext YoungsterJasonAfterBattleText
@@ -35,9 +35,9 @@
end
TrainerPsychicHerman:
- trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, PsychicHermanScript
+ trainer EVENT_BEAT_PSYCHIC_HERMAN, PSYCHIC_T, HERMAN, PsychicHermanSeenText, PsychicHermanBeatenText, 0, .Script
-PsychicHermanScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicHermanAfterBattleText
@@ -46,9 +46,9 @@
end
TrainerPsychicFidel:
- trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, PsychicFidelScript
+ trainer EVENT_BEAT_PSYCHIC_FIDEL, PSYCHIC_T, FIDEL, PsychicFidelSeenText, PsychicFidelBeatenText, 0, .Script
-PsychicFidelScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicFidelAfterBattleText
--- a/maps/Route12.asm
+++ b/maps/Route12.asm
@@ -14,9 +14,9 @@
db 0
TrainerFisherKyle:
- trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, FisherKyleScript
+ trainer EVENT_BEAT_FISHER_KYLE, FISHER, KYLE, FisherKyleSeenText, FisherKyleBeatenText, 0, .Script
-FisherKyleScript:
+.Script:
end_if_just_battled
opentext
writetext FisherKyleAfterBattleText
@@ -25,9 +25,9 @@
end
TrainerFisherMartin:
- trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, FisherMartinScript
+ trainer EVENT_BEAT_FISHER_MARTIN, FISHER, MARTIN, FisherMartinSeenText, FisherMartinBeatenText, 0, .Script
-FisherMartinScript:
+.Script:
end_if_just_battled
opentext
writetext FisherMartinAfterBattleText
@@ -36,9 +36,9 @@
end
TrainerFisherStephen:
- trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, FisherStephenScript
+ trainer EVENT_BEAT_FISHER_STEPHEN, FISHER, STEPHEN, FisherStephenSeenText, FisherStephenBeatenText, 0, .Script
-FisherStephenScript:
+.Script:
end_if_just_battled
opentext
writetext FisherStephenAfterBattleText
@@ -47,9 +47,9 @@
end
TrainerFisherBarney:
- trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, FisherBarneyScript
+ trainer EVENT_BEAT_FISHER_BARNEY, FISHER, BARNEY, FisherBarneySeenText, FisherBarneyBeatenText, 0, .Script
-FisherBarneyScript:
+.Script:
end_if_just_battled
opentext
writetext FisherBarneyAfterBattleText
--- a/maps/Route13.asm
+++ b/maps/Route13.asm
@@ -13,9 +13,9 @@
db 0
TrainerPokefanmAlex:
- trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, PokefanmAlexScript
+ trainer EVENT_BEAT_POKEFANM_ALEX, POKEFANM, ALEX, PokefanmAlexSeenText, PokefanmAlexBeatenText, 0, .Script
-PokefanmAlexScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmAlexAfterBattleText
@@ -24,9 +24,9 @@
end
TrainerPokefanmJoshua:
- trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, PokefanmJoshuaScript
+ trainer EVENT_BEAT_POKEFANM_JOSHUA, POKEFANM, JOSHUA, PokefanmJoshuaSeenText, PokefanmJoshuaBeatenText, 0, .Script
-PokefanmJoshuaScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmJoshuaAfterBattleText
@@ -35,9 +35,9 @@
end
TrainerBird_keeperPerry:
- trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, Bird_keeperPerryScript
+ trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script
-Bird_keeperPerryScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperPerryAfterBattleText
@@ -46,9 +46,9 @@
end
TrainerBird_keeperBret:
- trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, Bird_keeperBretScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script
-Bird_keeperBretScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperBretAfterBattleText
@@ -57,9 +57,9 @@
end
TrainerHikerKenny:
- trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, HikerKennyScript
+ trainer EVENT_BEAT_HIKER_KENNY, HIKER, KENNY, HikerKennySeenText, HikerKennyBeatenText, 0, .Script
-HikerKennyScript:
+.Script:
end_if_just_battled
opentext
writetext HikerKennyAfterBattleText
--- a/maps/Route14.asm
+++ b/maps/Route14.asm
@@ -20,9 +20,9 @@
end
TrainerPokefanmCarter:
- trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, PokefanmCarterScript
+ trainer EVENT_BEAT_POKEFANM_CARTER, POKEFANM, CARTER, PokefanmCarterSeenText, PokefanmCarterBeatenText, 0, .Script
-PokefanmCarterScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmCarterAfterBattleText
@@ -31,9 +31,9 @@
end
TrainerBird_keeperRoy:
- trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, Bird_keeperRoyScript
+ trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script
-Bird_keeperRoyScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperRoyAfterBattleText
@@ -42,9 +42,9 @@
end
TrainerPokefanmTrevor:
- trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, PokefanmTrevorScript
+ trainer EVENT_BEAT_POKEFANM_TREVOR, POKEFANM, TREVOR, PokefanmTrevorSeenText, PokefanmTrevorBeatenText, 0, .Script
-PokefanmTrevorScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmTrevorAfterBattleText
--- a/maps/Route15.asm
+++ b/maps/Route15.asm
@@ -15,9 +15,9 @@
db 0
TrainerTeacherColette:
- trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, TeacherColetteScript
+ trainer EVENT_BEAT_TEACHER_COLETTE, TEACHER, COLETTE, TeacherColetteSeenText, TeacherColetteBeatenText, 0, .Script
-TeacherColetteScript:
+.Script:
end_if_just_battled
opentext
writetext TeacherColetteAfterBattleText
@@ -26,9 +26,9 @@
end
TrainerTeacherHillary:
- trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, TeacherHillaryScript
+ trainer EVENT_BEAT_TEACHER_HILLARY, TEACHER, HILLARY, TeacherHillarySeenText, TeacherHillaryBeatenText, 0, .Script
-TeacherHillaryScript:
+.Script:
end_if_just_battled
opentext
writetext TeacherHillaryAfterBattleText
@@ -37,9 +37,9 @@
end
TrainerSchoolboyKipp:
- trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, SchoolboyKippScript
+ trainer EVENT_BEAT_SCHOOLBOY_KIP, SCHOOLBOY, KIPP, SchoolboyKippSeenText, SchoolboyKippBeatenText, 0, .Script
-SchoolboyKippScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyKippAfterBattleText
@@ -48,9 +48,9 @@
end
TrainerSchoolboyTommy:
- trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, SchoolboyTommyScript
+ trainer EVENT_BEAT_SCHOOLBOY_TOMMY, SCHOOLBOY, TOMMY, SchoolboyTommySeenText, SchoolboyTommyBeatenText, 0, .Script
-SchoolboyTommyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyTommyAfterBattleText
@@ -59,9 +59,9 @@
end
TrainerSchoolboyJohnny:
- trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, SchoolboyJohnnyScript
+ trainer EVENT_BEAT_SCHOOLBOY_JOHNNY, SCHOOLBOY, JOHNNY, SchoolboyJohnnySeenText, SchoolboyJohnnyBeatenText, 0, .Script
-SchoolboyJohnnyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyJohnnyAfterBattleText
@@ -70,9 +70,9 @@
end
TrainerSchoolboyBilly:
- trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, SchoolboyBillyScript
+ trainer EVENT_BEAT_SCHOOLBOY_BILLY, SCHOOLBOY, BILLY, SchoolboyBillySeenText, SchoolboyBillyBeatenText, 0, .Script
-SchoolboyBillyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyBillyAfterBattleText
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -18,9 +18,9 @@
return
TrainerBikerCharles:
- trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, BikerCharlesScript
+ trainer EVENT_BEAT_BIKER_CHARLES, BIKER, CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
-BikerCharlesScript:
+.Script:
end_if_just_battled
opentext
writetext BikerCharlesAfterBattleText
@@ -29,9 +29,9 @@
end
TrainerBikerRiley:
- trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, BikerRileyScript
+ trainer EVENT_BEAT_BIKER_RILEY, BIKER, RILEY, BikerRileySeenText, BikerRileyBeatenText, 0, .Script
-BikerRileyScript:
+.Script:
end_if_just_battled
opentext
writetext BikerRileyAfterBattleText
@@ -40,9 +40,9 @@
end
TrainerBikerJoel:
- trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, BikerJoelScript
+ trainer EVENT_BEAT_BIKER_JOEL, BIKER, JOEL, BikerJoelSeenText, BikerJoelBeatenText, 0, .Script
-BikerJoelScript:
+.Script:
end_if_just_battled
opentext
writetext BikerJoelAfterBattleText
@@ -51,9 +51,9 @@
end
TrainerBikerGlenn:
- trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, BikerGlennScript
+ trainer EVENT_BEAT_BIKER_GLENN, BIKER, GLENN, BikerGlennSeenText, BikerGlennBeatenText, 0, .Script
-BikerGlennScript:
+.Script:
end_if_just_battled
opentext
writetext BikerGlennAfterBattleText
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -10,9 +10,9 @@
db 0
TrainerBird_keeperBoris:
- trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script
-Bird_keeperBorisScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperBorisAfterBattleText
@@ -21,9 +21,9 @@
end
TrainerBird_keeperBob:
- trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script
-Bird_keeperBobScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperBobAfterBattleText
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -27,9 +27,9 @@
return
TrainerSwimmerfDawn:
- trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, SwimmerfDawnScript
+ trainer EVENT_BEAT_SWIMMERF_DAWN, SWIMMERF, DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
-SwimmerfDawnScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfDawnAfterBattleText
@@ -38,9 +38,9 @@
end
TrainerSwimmermHarold:
- trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, SwimmermHaroldScript
+ trainer EVENT_BEAT_SWIMMERM_HAROLD, SWIMMERM, HAROLD, SwimmermHaroldSeenText, SwimmermHaroldBeatenText, 0, .Script
-SwimmermHaroldScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermHaroldAfterBattleText
@@ -49,9 +49,9 @@
end
TrainerSwimmermJerome:
- trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, SwimmermJeromeScript
+ trainer EVENT_BEAT_SWIMMERM_JEROME, SWIMMERM, JEROME, SwimmermJeromeSeenText, SwimmermJeromeBeatenText, 0, .Script
-SwimmermJeromeScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermJeromeAfterBattleText
@@ -60,9 +60,9 @@
end
TrainerSwimmermTucker:
- trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, SwimmermTuckerScript
+ trainer EVENT_BEAT_SWIMMERM_TUCKER, SWIMMERM, TUCKER, SwimmermTuckerSeenText, SwimmermTuckerBeatenText, 0, .Script
-SwimmermTuckerScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermTuckerAfterBattleText
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -16,9 +16,9 @@
db 0
TrainerBug_catcherRob:
- trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, Bug_catcherRobScript
+ trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script
-Bug_catcherRobScript:
+.Script:
end_if_just_battled
opentext
writetext Bug_catcherRobAfterBattleText
@@ -27,9 +27,9 @@
end
TrainerBug_catcherEd:
- trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, Bug_catcherEdScript
+ trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script
-Bug_catcherEdScript:
+.Script:
end_if_just_battled
opentext
writetext Bug_catcherEdAfterBattleText
@@ -38,9 +38,9 @@
end
TrainerBug_catcherDoug:
- trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, Bug_catcherDougScript
+ trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script
-Bug_catcherDougScript:
+.Script:
end_if_just_battled
opentext
writetext Bug_catcherDougAfterBattleText
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -16,9 +16,9 @@
return
TrainerSwimmerfNicole:
- trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, SwimmerfNicoleScript
+ trainer EVENT_BEAT_SWIMMERF_NICOLE, SWIMMERF, NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
-SwimmerfNicoleScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfNicoleAfterBattleText
@@ -27,9 +27,9 @@
end
TrainerSwimmerfLori:
- trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, SwimmerfLoriScript
+ trainer EVENT_BEAT_SWIMMERF_LORI, SWIMMERF, LORI, SwimmerfLoriSeenText, SwimmerfLoriBeatenText, 0, .Script
-SwimmerfLoriScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfLoriAfterBattleText
@@ -38,9 +38,9 @@
end
TrainerSwimmermCameron:
- trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, SwimmermCameronScript
+ trainer EVENT_BEAT_SWIMMERM_CAMERON, SWIMMERM, CAMERON, SwimmermCameronSeenText, SwimmermCameronBeatenText, 0, .Script
-SwimmermCameronScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermCameronAfterBattleText
--- a/maps/Route21.asm
+++ b/maps/Route21.asm
@@ -11,9 +11,9 @@
db 0
TrainerSwimmermSeth:
- trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, SwimmermSethScript
+ trainer EVENT_BEAT_SWIMMERM_SETH, SWIMMERM, SETH, SwimmermSethSeenText, SwimmermSethBeatenText, 0, .Script
-SwimmermSethScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermSethAfterBattleText
@@ -22,9 +22,9 @@
end
TrainerSwimmerfNikki:
- trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, SwimmerfNikkiScript
+ trainer EVENT_BEAT_SWIMMERF_NIKKI, SWIMMERF, NIKKI, SwimmerfNikkiSeenText, SwimmerfNikkiBeatenText, 0, .Script
-SwimmerfNikkiScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfNikkiAfterBattleText
@@ -33,9 +33,9 @@
end
TrainerFisherArnold:
- trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, FisherArnoldScript
+ trainer EVENT_BEAT_FISHER_ARNOLD, FISHER, ARNOLD, FisherArnoldSeenText, FisherArnoldBeatenText, 0, .Script
-FisherArnoldScript:
+.Script:
end_if_just_battled
opentext
writetext FisherArnoldAfterBattleText
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -79,9 +79,9 @@
end
TrainerSchoolboyDudley:
- trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, SchoolboyDudleyScript
+ trainer EVENT_BEAT_SCHOOLBOY_DUDLEY, SCHOOLBOY, DUDLEY, SchoolboyDudleySeenText, SchoolboyDudleyBeatenText, 0, .Script
-SchoolboyDudleyScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyDudleyAfterBattleText
@@ -90,9 +90,9 @@
end
TrainerLassEllen:
- trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, LassEllenScript
+ trainer EVENT_BEAT_LASS_ELLEN, LASS, ELLEN, LassEllenSeenText, LassEllenBeatenText, 0, .Script
-LassEllenScript:
+.Script:
end_if_just_battled
opentext
writetext LassEllenAfterBattleText
@@ -101,9 +101,9 @@
end
TrainerSchoolboyJoe:
- trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, SchoolboyJoeScript
+ trainer EVENT_BEAT_SCHOOLBOY_JOE, SCHOOLBOY, JOE, SchoolboyJoeSeenText, SchoolboyJoeBeatenText, 0, .Script
-SchoolboyJoeScript:
+.Script:
end_if_just_battled
opentext
writetext SchoolboyJoeAfterBattleText
@@ -112,9 +112,9 @@
end
TrainerLassLaura:
- trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, LassLauraScript
+ trainer EVENT_BEAT_LASS_LAURA, LASS, LAURA, LassLauraSeenText, LassLauraBeatenText, 0, .Script
-LassLauraScript:
+.Script:
end_if_just_battled
opentext
writetext LassLauraAfterBattleText
@@ -123,9 +123,9 @@
end
TrainerCamperLloyd:
- trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, CamperLloydScript
+ trainer EVENT_BEAT_CAMPER_LLOYD, CAMPER, LLOYD, CamperLloydSeenText, CamperLloydBeatenText, 0, .Script
-CamperLloydScript:
+.Script:
end_if_just_battled
opentext
writetext CamperLloydAfterBattleText
@@ -134,9 +134,9 @@
end
TrainerLassShannon:
- trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, LassShannonScript
+ trainer EVENT_BEAT_LASS_SHANNON, LASS, SHANNON, LassShannonSeenText, LassShannonBeatenText, 0, .Script
-LassShannonScript:
+.Script:
end_if_just_battled
opentext
writetext LassShannonAfterBattleText
@@ -145,9 +145,9 @@
end
TrainerSupernerdPat:
- trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, SupernerdPatScript
+ trainer EVENT_BEAT_SUPER_NERD_PAT, SUPER_NERD, PAT, SupernerdPatSeenText, SupernerdPatBeatenText, 0, .Script
-SupernerdPatScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdPatAfterBattleText
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -16,9 +16,9 @@
db 0
TrainerCooltrainermJake:
- trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, CooltrainermJakeScript
+ trainer EVENT_BEAT_COOLTRAINERM_JAKE, COOLTRAINERM, JAKE, CooltrainermJakeSeenText, CooltrainermJakeBeatenText, 0, .Script
-CooltrainermJakeScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermJakeAfterBattleText
@@ -27,9 +27,9 @@
end
TrainerCooltrainermGaven3:
- trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, CooltrainermGaven3Script
+ trainer EVENT_BEAT_COOLTRAINERM_GAVEN, COOLTRAINERM, GAVEN3, CooltrainermGaven3SeenText, CooltrainermGaven3BeatenText, 0, .Script
-CooltrainermGaven3Script:
+.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN
end_if_just_battled
opentext
@@ -120,9 +120,9 @@
end
TrainerCooltrainerfJoyce:
- trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, CooltrainerfJoyceScript
+ trainer EVENT_BEAT_COOLTRAINERF_JOYCE, COOLTRAINERF, JOYCE, CooltrainerfJoyceSeenText, CooltrainerfJoyceBeatenText, 0, .Script
-CooltrainerfJoyceScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfJoyceAfterBattleText
@@ -131,9 +131,9 @@
end
TrainerCooltrainerfBeth1:
- trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, CooltrainerfBeth1Script
+ trainer EVENT_BEAT_COOLTRAINERF_BETH, COOLTRAINERF, BETH1, CooltrainerfBeth1SeenText, CooltrainerfBeth1BeatenText, 0, .Script
-CooltrainerfBeth1Script:
+.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH
end_if_just_battled
opentext
@@ -224,9 +224,9 @@
end
TrainerPsychicRichard:
- trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, PsychicRichardScript
+ trainer EVENT_BEAT_PSYCHIC_RICHARD, PSYCHIC_T, RICHARD, PsychicRichardSeenText, PsychicRichardBeatenText, 0, .Script
-PsychicRichardScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicRichardAfterBattleText
@@ -235,9 +235,9 @@
end
TrainerFisherScott:
- trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, FisherScottScript
+ trainer EVENT_BEAT_FISHER_SCOTT, FISHER, SCOTT, FisherScottSeenText, FisherScottBeatenText, 0, .Script
-FisherScottScript:
+.Script:
end_if_just_battled
opentext
writetext FisherScottAfterBattleText
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -49,9 +49,9 @@
jumptextfaceplayer Route27FisherText
TrainerPsychicGilbert:
- trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, PsychicGilbertScript
+ trainer EVENT_BEAT_PSYCHIC_GILBERT, PSYCHIC_T, GILBERT, PsychicGilbertSeenText, PsychicGilbertBeatenText, 0, .Script
-PsychicGilbertScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicGilbertAfterBattleText
@@ -60,9 +60,9 @@
end
TrainerBird_keeperJose2:
- trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, Bird_keeperJose2Script
+ trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script
-Bird_keeperJose2Script:
+.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE
end_if_just_battled
opentext
@@ -173,9 +173,9 @@
end
TrainerCooltrainermBlake:
- trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, CooltrainermBlakeScript
+ trainer EVENT_BEAT_COOLTRAINERM_BLAKE, COOLTRAINERM, BLAKE, CooltrainermBlakeSeenText, CooltrainermBlakeBeatenText, 0, .Script
-CooltrainermBlakeScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermBlakeAfterBattleText
@@ -184,9 +184,9 @@
end
TrainerCooltrainermBrian:
- trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, CooltrainermBrianScript
+ trainer EVENT_BEAT_COOLTRAINERM_BRIAN, COOLTRAINERM, BRIAN, CooltrainermBrianSeenText, CooltrainermBrianBeatenText, 0, .Script
-CooltrainermBrianScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermBrianAfterBattleText
@@ -195,9 +195,9 @@
end
TrainerCooltrainerfReena:
- trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, CooltrainerfReena1Script
+ trainer EVENT_BEAT_COOLTRAINERF_REENA, COOLTRAINERF, REENA1, CooltrainerfReena1SeenText, CooltrainerfReena1BeatenText, 0, .Script
-CooltrainerfReena1Script:
+.Script:
writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA
end_if_just_battled
opentext
@@ -288,9 +288,9 @@
end
TrainerCooltrainerfMegan:
- trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, CooltrainerfMeganScript
+ trainer EVENT_BEAT_COOLTRAINERF_MEGAN, COOLTRAINERF, MEGAN, CooltrainerfMeganSeenText, CooltrainerfMeganBeatenText, 0, .Script
-CooltrainerfMeganScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfMeganAfterBattleText
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -12,9 +12,9 @@
db 0
TrainerFirebreatherOtis:
- trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript
+ trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script
-FirebreatherOtisScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherOtisAfterBattleText
@@ -23,9 +23,9 @@
end
TrainerYoungsterWarren:
- trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript
+ trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script
-YoungsterWarrenScript:
+.Script:
end_if_just_battled
opentext
writetext YoungsterWarrenAfterBattleText
@@ -34,9 +34,9 @@
end
TrainerYoungsterJimmy:
- trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript
+ trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script
-YoungsterJimmyScript:
+.Script:
end_if_just_battled
opentext
writetext YoungsterJimmyAfterBattleText
@@ -45,9 +45,9 @@
end
TrainerFirebreatherBurt:
- trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript
+ trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script
-FirebreatherBurtScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherBurtAfterBattleText
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -19,9 +19,9 @@
db 0
TrainerBird_keeperBryan:
- trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, Bird_keeperBryanScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script
-Bird_keeperBryanScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperBryanAfterBattleText
@@ -30,9 +30,9 @@
end
TrainerJugglerIrwin:
- trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, JugglerIrwin1Script
+ trainer EVENT_BEAT_JUGGLER_IRWIN, JUGGLER, IRWIN1, JugglerIrwin1SeenText, JugglerIrwin1BeatenText, 0, .Script
-JugglerIrwin1Script:
+.Script:
writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN
end_if_just_battled
opentext
@@ -85,9 +85,9 @@
end
TrainerCamperIvan:
- trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, CamperIvanScript
+ trainer EVENT_BEAT_CAMPER_IVAN, CAMPER, IVAN, CamperIvanSeenText, CamperIvanBeatenText, 0, .Script
-CamperIvanScript:
+.Script:
end_if_just_battled
opentext
writetext CamperIvanAfterBattleText
@@ -96,9 +96,9 @@
end
TrainerCamperElliot:
- trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, CamperElliotScript
+ trainer EVENT_BEAT_CAMPER_ELLIOT, CAMPER, ELLIOT, CamperElliotSeenText, CamperElliotBeatenText, 0, .Script
-CamperElliotScript:
+.Script:
end_if_just_battled
opentext
writetext CamperElliotAfterBattleText
@@ -107,9 +107,9 @@
end
TrainerPicnickerBrooke:
- trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, PicnickerBrookeScript
+ trainer EVENT_BEAT_PICNICKER_BROOKE, PICNICKER, BROOKE, PicnickerBrookeSeenText, PicnickerBrookeBeatenText, 0, .Script
-PicnickerBrookeScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerBrookeAfterBattleText
@@ -118,9 +118,9 @@
end
TrainerPicnickerKim:
- trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, PicnickerKimScript
+ trainer EVENT_BEAT_PICNICKER_KIM, PICNICKER, KIM, PicnickerKimSeenText, PicnickerKimBeatenText, 0, .Script
-PicnickerKimScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerKimAfterBattleText
@@ -129,9 +129,9 @@
end
TrainerBug_catcherArnie1:
- trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, Bug_catcherArnie1Script
+ trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script
-Bug_catcherArnie1Script:
+.Script:
writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE
end_if_just_battled
opentext
@@ -226,9 +226,9 @@
end
TrainerFirebreatherWalt:
- trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, FirebreatherWaltScript
+ trainer EVENT_BEAT_FIREBREATHER_WALT, FIREBREATHER, WALT, FirebreatherWaltSeenText, FirebreatherWaltBeatenText, 0, .Script
-FirebreatherWaltScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherWaltAfterBattleText
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -310,7 +310,7 @@
.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x19471e
+ writetext PsychicMarkAfterBattleText
waitbutton
closetext
end
@@ -553,7 +553,7 @@
text "I misread you!"
done
-UnknownText_0x19471e:
+PsychicMarkAfterBattleText:
text "I'd be strong if"
line "only I could tell"
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -26,9 +26,9 @@
return
TrainerTwinsAnnandanne1:
- trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, TwinsAnnandanne1Script
+ trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
-TwinsAnnandanne1Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsAnnandanne1AfterBattleText
@@ -37,9 +37,9 @@
end
TrainerTwinsAnnandanne2:
- trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, TwinsAnnandanne2Script
+ trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, 0, .Script
-TwinsAnnandanne2Script:
+.Script:
end_if_just_battled
opentext
writetext TwinsAnnandanne2AfterBattleText
@@ -48,9 +48,9 @@
end
TrainerPsychicGreg:
- trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, PsychicGregScript
+ trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, 0, .Script
-PsychicGregScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicGregAfterBattleText
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -15,31 +15,31 @@
db 0
TrainerBird_keeperToby:
- trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script
+ trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script
-.script
+.Script
end_if_just_battled
opentext
- writetext UnknownText_0x1a1f86
+ writetext Bird_keeperTobyAfterBattleText
waitbutton
closetext
end
TrainerSailorHarry:
- trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script
+ trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .Script
-.script
+.Script
end_if_just_battled
opentext
- writetext UnknownText_0x1a220c
+ writetext SailorHarryAfterBattleText
waitbutton
closetext
end
TrainerLassDana1:
- trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script
+ trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .Script
-.script
+.Script
writecode VAR_CALLERID, PHONE_LASS_DANA
end_if_just_battled
opentext
@@ -175,9 +175,9 @@
end
TrainerSchoolboyChad1:
- trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script
+ trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .Script
-.script
+.Script
writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
end_if_just_battled
opentext
@@ -292,23 +292,23 @@
end
TrainerBeautyValerie:
- trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script
+ trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .Script
-.script
+.Script
end_if_just_battled
opentext
- writetext UnknownText_0x1a2185
+ writetext BeautyValerieAfterBattleText
waitbutton
closetext
end
TrainerBeautyOlivia:
- trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script
+ trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .Script
-.script
+.Script
end_if_just_battled
opentext
- writetext UnknownText_0x1a229a
+ writetext BeautyOliviaAfterBattleText
waitbutton
closetext
end
@@ -333,7 +333,7 @@
line "flying away now."
done
-UnknownText_0x1a1f86:
+Bird_keeperTobyAfterBattleText:
text "I plan to train in"
line "CIANWOOD CITY to"
@@ -400,7 +400,7 @@
line "see your #MON!"
done
-UnknownText_0x1a2185:
+BeautyValerieAfterBattleText:
text "When I see #-"
line "MON, it seems to"
cont "soothe my nerves."
@@ -419,7 +419,7 @@
line "world class!"
done
-UnknownText_0x1a220c:
+SailorHarryAfterBattleText:
text "All kinds of peo-"
line "ple around the"
@@ -438,7 +438,7 @@
line "MILK every day."
done
-UnknownText_0x1a229a:
+BeautyOliviaAfterBattleText:
text "MOOMOO MILK is"
line "good for beauty"
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -26,9 +26,9 @@
end
TrainerPokefanmDerek1:
- trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, PokefanmDerek1Script
+ trainer EVENT_BEAT_POKEFANM_DEREK, POKEFANM, DEREK1, PokefanmDerek1SeenText, PokefanmDerek1BeatenText, 0, .Script
-PokefanmDerek1Script:
+.Script:
writecode VAR_CALLERID, PHONE_POKEFANM_DEREK
end_if_just_battled
opentext
@@ -105,9 +105,9 @@
end
TrainerPokefanfRuth:
- trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, PokefanfRuthScript
+ trainer EVENT_BEAT_POKEFANF_RUTH, POKEFANF, RUTH, PokefanfRuthSeenText, PokefanfRuthBeatenText, 0, .Script
-PokefanfRuthScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanfRuthAfterBattleText
@@ -116,9 +116,9 @@
end
TrainerSailorEugene:
- trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, SailorEugeneScript
+ trainer EVENT_BEAT_SAILOR_EUGENE, SAILOR, EUGENE, SailorEugeneSeenText, SailorEugeneBeatenText, 0, .Script
-SailorEugeneScript:
+.Script:
end_if_just_battled
opentext
writetext SailorEugeneAfterBattleText
@@ -127,9 +127,9 @@
end
TrainerPsychicNorman:
- trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, PsychicNormanScript
+ trainer EVENT_BEAT_PSYCHIC_NORMAN, PSYCHIC_T, NORMAN, PsychicNormanSeenText, PsychicNormanBeatenText, 0, .Script
-PsychicNormanScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicNormanAfterBattleText
--- a/maps/Route4.asm
+++ b/maps/Route4.asm
@@ -12,9 +12,9 @@
db 0
TrainerBird_keeperHank:
- trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, Bird_keeperHankScript
+ trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script
-Bird_keeperHankScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperHankAfterBattleText
@@ -23,9 +23,9 @@
end
TrainerPicnickerHope:
- trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, PicnickerHopeScript
+ trainer EVENT_BEAT_PICNICKER_HOPE, PICNICKER, HOPE, PicnickerHopeSeenText, PicnickerHopeBeatenText, 0, .Script
-PicnickerHopeScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerHopeAfterBattleText
@@ -34,9 +34,9 @@
end
TrainerPicnickerSharon:
- trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, PicnickerSharonScript
+ trainer EVENT_BEAT_PICNICKER_SHARON, PICNICKER, SHARON, PicnickerSharonSeenText, PicnickerSharonBeatenText, 0, .Script
-PicnickerSharonScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerSharonAfterBattleText
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -32,9 +32,9 @@
return
TrainerSwimmerfElaine:
- trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, SwimmerfElaineScript
+ trainer EVENT_BEAT_SWIMMERF_ELAINE, SWIMMERF, ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
-SwimmerfElaineScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfElaineAfterBattleText
@@ -43,9 +43,9 @@
end
TrainerSwimmerfPaula:
- trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, SwimmerfPaulaScript
+ trainer EVENT_BEAT_SWIMMERF_PAULA, SWIMMERF, PAULA, SwimmerfPaulaSeenText, SwimmerfPaulaBeatenText, 0, .Script
-SwimmerfPaulaScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfPaulaAfterBattleText
@@ -54,9 +54,9 @@
end
TrainerSwimmermSimon:
- trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, SwimmermSimonScript
+ trainer EVENT_BEAT_SWIMMERM_SIMON, SWIMMERM, SIMON, SwimmermSimonSeenText, SwimmermSimonBeatenText, 0, .Script
-SwimmermSimonScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermSimonAfterBattleText
@@ -65,9 +65,9 @@
end
TrainerSwimmermRandall:
- trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, SwimmermRandallScript
+ trainer EVENT_BEAT_SWIMMERM_RANDALL, SWIMMERM, RANDALL, SwimmermRandallSeenText, SwimmermRandallBeatenText, 0, .Script
-SwimmermRandallScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermRandallAfterBattleText
--- a/maps/Route41.asm
+++ b/maps/Route41.asm
@@ -18,9 +18,9 @@
db 0
TrainerSwimmerfKaylee:
- trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, SwimmerfKayleeScript
+ trainer EVENT_BEAT_SWIMMERF_KAYLEE, SWIMMERF, KAYLEE, SwimmerfKayleeSeenText, SwimmerfKayleeBeatenText, 0, .Script
-SwimmerfKayleeScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfKayleeAfterBattleText
@@ -29,9 +29,9 @@
end
TrainerSwimmerfSusie:
- trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, SwimmerfSusieScript
+ trainer EVENT_BEAT_SWIMMERF_SUSIE, SWIMMERF, SUSIE, SwimmerfSusieSeenText, SwimmerfSusieBeatenText, 0, .Script
-SwimmerfSusieScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfSusieAfterBattleText
@@ -40,9 +40,9 @@
end
TrainerSwimmerfDenise:
- trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, SwimmerfDeniseScript
+ trainer EVENT_BEAT_SWIMMERF_DENISE, SWIMMERF, DENISE, SwimmerfDeniseSeenText, SwimmerfDeniseBeatenText, 0, .Script
-SwimmerfDeniseScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfDeniseAfterBattleText
@@ -51,9 +51,9 @@
end
TrainerSwimmerfKara:
- trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, SwimmerfKaraScript
+ trainer EVENT_BEAT_SWIMMERF_KARA, SWIMMERF, KARA, SwimmerfKaraSeenText, SwimmerfKaraBeatenText, 0, .Script
-SwimmerfKaraScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfKaraAfterBattleText
@@ -62,9 +62,9 @@
end
TrainerSwimmerfWendy:
- trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, SwimmerfWendyScript
+ trainer EVENT_BEAT_SWIMMERF_WENDY, SWIMMERF, WENDY, SwimmerfWendySeenText, SwimmerfWendyBeatenText, 0, .Script
-SwimmerfWendyScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmerfWendyAfterBattleText
@@ -73,9 +73,9 @@
end
TrainerSwimmermCharlie:
- trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, SwimmermCharlieScript
+ trainer EVENT_BEAT_SWIMMERM_CHARLIE, SWIMMERM, CHARLIE, SwimmermCharlieSeenText, SwimmermCharlieBeatenText, 0, .Script
-SwimmermCharlieScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermCharlieAfterBattleText
@@ -84,9 +84,9 @@
end
TrainerSwimmermGeorge:
- trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, SwimmermGeorgeScript
+ trainer EVENT_BEAT_SWIMMERM_GEORGE, SWIMMERM, GEORGE, SwimmermGeorgeSeenText, SwimmermGeorgeBeatenText, 0, .Script
-SwimmermGeorgeScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermGeorgeAfterBattleText
@@ -95,9 +95,9 @@
end
TrainerSwimmermBerke:
- trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, SwimmermBerkeScript
+ trainer EVENT_BEAT_SWIMMERM_BERKE, SWIMMERM, BERKE, SwimmermBerkeSeenText, SwimmermBerkeBeatenText, 0, .Script
-SwimmermBerkeScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermBerkeAfterBattleText
@@ -106,9 +106,9 @@
end
TrainerSwimmermKirk:
- trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, SwimmermKirkScript
+ trainer EVENT_BEAT_SWIMMERM_KIRK, SWIMMERM, KIRK, SwimmermKirkSeenText, SwimmermKirkBeatenText, 0, .Script
-SwimmermKirkScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermKirkAfterBattleText
@@ -117,9 +117,9 @@
end
TrainerSwimmermMathew:
- trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, SwimmermMathewScript
+ trainer EVENT_BEAT_SWIMMERM_MATHEW, SWIMMERM, MATHEW, SwimmermMathewSeenText, SwimmermMathewBeatenText, 0, .Script
-SwimmermMathewScript:
+.Script:
end_if_just_battled
opentext
writetext SwimmermMathewAfterBattleText
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -37,9 +37,9 @@
end
TrainerFisherTully1:
- trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, FisherTully1Script
+ trainer EVENT_BEAT_FISHER_TULLY, FISHER, TULLY1, FisherTully1SeenText, FisherTully1BeatenText, 0, .Script
-FisherTully1Script:
+.Script:
writecode VAR_CALLERID, PHONE_FISHER_TULLY
end_if_just_battled
opentext
@@ -163,9 +163,9 @@
end
TrainerPokemaniacShane:
- trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, PokemaniacShaneScript
+ trainer EVENT_BEAT_POKEMANIAC_SHANE, POKEMANIAC, SHANE, PokemaniacShaneSeenText, PokemaniacShaneBeatenText, 0, .Script
-PokemaniacShaneScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacShaneAfterBattleText
@@ -174,9 +174,9 @@
end
TrainerHikerBenjamin:
- trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, HikerBenjaminScript
+ trainer EVENT_BEAT_HIKER_BENJAMIN, HIKER, BENJAMIN, HikerBenjaminSeenText, HikerBenjaminBeatenText, 0, .Script
-HikerBenjaminScript:
+.Script:
end_if_just_battled
opentext
writetext HikerBenjaminAfterBattleText
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -27,9 +27,9 @@
return
TrainerCamperSpencer:
- trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, CamperSpencerScript
+ trainer EVENT_BEAT_CAMPER_SPENCER, CAMPER, SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
-CamperSpencerScript:
+.Script:
end_if_just_battled
opentext
writetext CamperSpencerAfterBattleText
@@ -38,9 +38,9 @@
end
TrainerPokemaniacBen:
- trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, PokemaniacBenScript
+ trainer EVENT_BEAT_POKEMANIAC_BEN, POKEMANIAC, BEN, PokemaniacBenSeenText, PokemaniacBenBeatenText, 0, .Script
-PokemaniacBenScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacBenAfterBattleText
@@ -49,9 +49,9 @@
end
TrainerPokemaniacBrent1:
- trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, PokemaniacBrent1Script
+ trainer EVENT_BEAT_POKEMANIAC_BRENT, POKEMANIAC, BRENT1, PokemaniacBrent1SeenText, PokemaniacBrent1BeatenText, 0, .Script
-PokemaniacBrent1Script:
+.Script:
writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT
end_if_just_battled
opentext
@@ -154,9 +154,9 @@
end
TrainerPokemaniacRon:
- trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, PokemaniacRonScript
+ trainer EVENT_BEAT_POKEMANIAC_RON, POKEMANIAC, RON, PokemaniacRonSeenText, PokemaniacRonBeatenText, 0, .Script
-PokemaniacRonScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacRonAfterBattleText
@@ -165,9 +165,9 @@
end
TrainerFisherMarvin:
- trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, FisherMarvinScript
+ trainer EVENT_BEAT_FISHER_MARVIN, FISHER, MARVIN, FisherMarvinSeenText, FisherMarvinBeatenText, 0, .Script
-FisherMarvinScript:
+.Script:
end_if_just_battled
opentext
writetext FisherMarvinAfterBattleText
@@ -176,9 +176,9 @@
end
TrainerPicnickerTiffany3:
- trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, PicnickerTiffany3Script
+ trainer EVENT_BEAT_PICNICKER_TIFFANY, PICNICKER, TIFFANY3, PicnickerTiffany3SeenText, PicnickerTiffany3BeatenText, 0, .Script
-PicnickerTiffany3Script:
+.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY
end_if_just_battled
opentext
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -19,9 +19,9 @@
db 0
TrainerBird_keeperVance1:
- trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, Bird_keeperVance1Script
+ trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script
-Bird_keeperVance1Script:
+.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
end_if_just_battled
opentext
@@ -150,9 +150,9 @@
end
TrainerPsychicPhil:
- trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, PsychicPhilScript
+ trainer EVENT_BEAT_PSYCHIC_PHIL, PSYCHIC_T, PHIL, PsychicPhilSeenText, PsychicPhilBeatenText, 0, .Script
-PsychicPhilScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicPhilAfterBattleText
@@ -161,9 +161,9 @@
end
TrainerFisherWilton1:
- trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, FisherWilton1Script
+ trainer EVENT_BEAT_FISHER_WILTON, FISHER, WILTON1, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
-FisherWilton1Script:
+.Script:
writecode VAR_CALLERID, PHONE_FISHER_WILTON
end_if_just_battled
opentext
@@ -256,9 +256,9 @@
jump UnknownScript_0x19d8ff
TrainerFisherEdgar:
- trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, FisherEdgarScript
+ trainer EVENT_BEAT_FISHER_EDGAR, FISHER, EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
-FisherEdgarScript:
+.Script:
end_if_just_battled
opentext
writetext FisherEdgarAfterBattleText
@@ -267,9 +267,9 @@
end
TrainerCooltrainerfCybil:
- trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, CooltrainerfCybilScript
+ trainer EVENT_BEAT_COOLTRAINERF_CYBIL, COOLTRAINERF, CYBIL, CooltrainerfCybilSeenText, CooltrainerfCybilBeatenText, 0, .Script
-CooltrainerfCybilScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfCybilAfterBattleText
@@ -278,9 +278,9 @@
end
TrainerPokemaniacZach:
- trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, PokemaniacZachScript
+ trainer EVENT_BEAT_POKEMANIAC_ZACH, POKEMANIAC, ZACH, PokemaniacZachSeenText, PokemaniacZachBeatenText, 0, .Script
-PokemaniacZachScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacZachAfterBattleText
@@ -289,9 +289,9 @@
end
TrainerCooltrainermAllen:
- trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, CooltrainermAllenScript
+ trainer EVENT_BEAT_COOLTRAINERM_ALLEN, COOLTRAINERM, ALLEN, CooltrainermAllenSeenText, CooltrainermAllenBeatenText, 0, .Script
-CooltrainermAllenScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermAllenAfterBattleText
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -21,9 +21,9 @@
db 0
TrainerBlackbeltKenji:
- trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, BlackbeltKenji3Script
+ trainer EVENT_BEAT_BLACKBELT_KENJI, BLACKBELT_T, KENJI3, BlackbeltKenji3SeenText, BlackbeltKenji3BeatenText, 0, .Script
-BlackbeltKenji3Script:
+.Script:
writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI
end_if_just_battled
opentext
@@ -125,9 +125,9 @@
end
TrainerHikerErik:
- trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, HikerErikScript
+ trainer EVENT_BEAT_HIKER_ERIK, HIKER, ERIK, HikerErikSeenText, HikerErikBeatenText, 0, .Script
-HikerErikScript:
+.Script:
end_if_just_battled
opentext
writetext HikerErikAfterBattleText
@@ -136,9 +136,9 @@
end
TrainerHikerMichael:
- trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, HikerMichaelScript
+ trainer EVENT_BEAT_HIKER_MICHAEL, HIKER, MICHAEL, HikerMichaelSeenText, HikerMichaelBeatenText, 0, .Script
-HikerMichaelScript:
+.Script:
end_if_just_battled
opentext
writetext HikerMichaelAfterBattleText
@@ -147,9 +147,9 @@
end
TrainerHikerParry:
- trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, HikerParry3Script
+ trainer EVENT_BEAT_HIKER_PARRY, HIKER, PARRY3, HikerParry3SeenText, HikerParry3BeatenText, 0, .Script
-HikerParry3Script:
+.Script:
writecode VAR_CALLERID, PHONE_HIKER_PARRY
end_if_just_battled
opentext
@@ -233,9 +233,9 @@
jump UnknownScript_0x19e127
TrainerHikerTimothy:
- trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, HikerTimothyScript
+ trainer EVENT_BEAT_HIKER_TIMOTHY, HIKER, TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
-HikerTimothyScript:
+.Script:
end_if_just_battled
opentext
writetext HikerTimothyAfterBattleText
@@ -244,9 +244,9 @@
end
TrainerCooltrainermRyan:
- trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, CooltrainermRyanScript
+ trainer EVENT_BEAT_COOLTRAINERM_RYAN, COOLTRAINERM, RYAN, CooltrainermRyanSeenText, CooltrainermRyanBeatenText, 0, .Script
-CooltrainermRyanScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermRyanAfterBattleText
@@ -255,9 +255,9 @@
end
TrainerCooltrainerfKelly:
- trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, CooltrainerfKellyScript
+ trainer EVENT_BEAT_COOLTRAINERF_KELLY, COOLTRAINERF, KELLY, CooltrainerfKellySeenText, CooltrainerfKellyBeatenText, 0, .Script
-CooltrainerfKellyScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfKellyAfterBattleText
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -14,9 +14,9 @@
db 0
TrainerCamperTed:
- trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, CamperTedScript
+ trainer EVENT_BEAT_CAMPER_TED, CAMPER, TED, CamperTedSeenText, CamperTedBeatenText, 0, .Script
-CamperTedScript:
+.Script:
end_if_just_battled
opentext
writetext CamperTedAfterBattleText
@@ -25,9 +25,9 @@
end
TrainerPicnickerErin1:
- trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, PicnickerErin1Script
+ trainer EVENT_BEAT_PICNICKER_ERIN, PICNICKER, ERIN1, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script
-PicnickerErin1Script:
+.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
end_if_just_battled
opentext
@@ -148,9 +148,9 @@
end
TrainerHikerBailey:
- trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, HikerBaileyScript
+ trainer EVENT_BEAT_HIKER_BAILEY, HIKER, BAILEY, HikerBaileySeenText, HikerBaileyBeatenText, 0, .Script
-HikerBaileyScript:
+.Script:
end_if_just_battled
opentext
writetext HikerBaileyAfterBattleText
--- a/maps/Route6.asm
+++ b/maps/Route6.asm
@@ -11,9 +11,9 @@
db 0
TrainerPokefanmRex:
- trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, PokefanmRexScript
+ trainer EVENT_BEAT_POKEFANM_REX, POKEFANM, REX, PokefanmRexSeenText, PokefanmRexBeatenText, 0, .Script
-PokefanmRexScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmRexAfterBattleText
@@ -22,9 +22,9 @@
end
TrainerPokefanmAllan:
- trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, PokefanmAllanScript
+ trainer EVENT_BEAT_POKEFANM_ALLAN, POKEFANM, ALLAN, PokefanmAllanSeenText, PokefanmAllanBeatenText, 0, .Script
-PokefanmAllanScript:
+.Script:
end_if_just_battled
opentext
writetext PokefanmAllanAfterBattleText
--- a/maps/Route8.asm
+++ b/maps/Route8.asm
@@ -14,9 +14,9 @@
db 0
TrainerBikerDwayne:
- trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, BikerDwayneScript
+ trainer EVENT_BEAT_BIKER_DWAYNE, BIKER, DWAYNE, BikerDwayneSeenText, BikerDwayneBeatenText, 0, .Script
-BikerDwayneScript:
+.Script:
end_if_just_battled
opentext
writetext BikerDwayneAfterBattleText
@@ -25,9 +25,9 @@
end
TrainerBikerHarris:
- trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, BikerHarrisScript
+ trainer EVENT_BEAT_BIKER_HARRIS, BIKER, HARRIS, BikerHarrisSeenText, BikerHarrisBeatenText, 0, .Script
-BikerHarrisScript:
+.Script:
end_if_just_battled
opentext
writetext BikerHarrisAfterBattleText
@@ -36,9 +36,9 @@
end
TrainerBikerZeke:
- trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, BikerZekeScript
+ trainer EVENT_BEAT_BIKER_ZEKE, BIKER, ZEKE, BikerZekeSeenText, BikerZekeBeatenText, 0, .Script
-BikerZekeScript:
+.Script:
end_if_just_battled
opentext
writetext BikerZekeAfterBattleText
@@ -47,9 +47,9 @@
end
TrainerSupernerdSam:
- trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, SupernerdSamScript
+ trainer EVENT_BEAT_SUPER_NERD_SAM, SUPER_NERD, SAM, SupernerdSamSeenText, SupernerdSamBeatenText, 0, .Script
-SupernerdSamScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdSamAfterBattleText
@@ -58,9 +58,9 @@
end
TrainerSupernerdTom:
- trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, SupernerdTomScript
+ trainer EVENT_BEAT_SUPER_NERD_TOM, SUPER_NERD, TOM, SupernerdTomSeenText, SupernerdTomBeatenText, 0, .Script
-SupernerdTomScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdTomAfterBattleText
--- a/maps/Route9.asm
+++ b/maps/Route9.asm
@@ -14,9 +14,9 @@
db 0
TrainerCamperDean:
- trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, CamperDeanScript
+ trainer EVENT_BEAT_CAMPER_DEAN, CAMPER, DEAN, CamperDeanSeenText, CamperDeanBeatenText, 0, .Script
-CamperDeanScript:
+.Script:
end_if_just_battled
opentext
writetext CamperDeanAfterBattleText
@@ -25,9 +25,9 @@
end
TrainerPicnickerHeidi:
- trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, PicnickerHeidiScript
+ trainer EVENT_BEAT_PICNICKER_HEIDI, PICNICKER, HEIDI, PicnickerHeidiSeenText, PicnickerHeidiBeatenText, 0, .Script
-PicnickerHeidiScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerHeidiAfterBattleText
@@ -36,9 +36,9 @@
end
TrainerCamperSid:
- trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, CamperSidScript
+ trainer EVENT_BEAT_CAMPER_SID, CAMPER, SID, CamperSidSeenText, CamperSidBeatenText, 0, .Script
-CamperSidScript:
+.Script:
end_if_just_battled
opentext
writetext CamperSidAfterBattleText
@@ -47,9 +47,9 @@
end
TrainerPicnickerEdna:
- trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, PicnickerEdnaScript
+ trainer EVENT_BEAT_PICNICKER_EDNA, PICNICKER, EDNA, PicnickerEdnaSeenText, PicnickerEdnaBeatenText, 0, .Script
-PicnickerEdnaScript:
+.Script:
end_if_just_battled
opentext
writetext PicnickerEdnaAfterBattleText
@@ -58,9 +58,9 @@
end
TrainerHikerTim:
- trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, HikerTimScript
+ trainer EVENT_BEAT_HIKER_TIM, HIKER, TIM, HikerTimSeenText, HikerTimBeatenText, 0, .Script
-HikerTimScript:
+.Script:
end_if_just_battled
opentext
writetext HikerTimAfterBattleText
@@ -69,9 +69,9 @@
end
TrainerHikerSidney:
- trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, HikerSidneyScript
+ trainer EVENT_BEAT_HIKER_SIDNEY, HIKER, SIDNEY, HikerSidneySeenText, HikerSidneyBeatenText, 0, .Script
-HikerSidneyScript:
+.Script:
end_if_just_battled
opentext
writetext HikerSidneyAfterBattleText
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -102,9 +102,9 @@
end
TrainerPsychicNathan:
- trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, PsychicNathanScript
+ trainer EVENT_BEAT_PSYCHIC_NATHAN, PSYCHIC_T, NATHAN, PsychicNathanSeenText, PsychicNathanBeatenText, 0, .Script
-PsychicNathanScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicNathanAfterBattleText
@@ -114,12 +114,12 @@
TrainerSuperNerdStan:
- trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, UnknownScript_0x580a9
+ trainer EVENT_BEAT_SUPER_NERD_STAN, SUPER_NERD, STAN, UnknownText_0x581e5, UnknownText_0x58217, 0, .Script
-UnknownScript_0x580a9:
+.Script:
end_if_just_battled
opentext
- writetext UnknownText_0x58250
+ writetext SuperNerdStanAfterBattleText
waitbutton
closetext
end
@@ -194,7 +194,7 @@
line "understanding…"
done
-UnknownText_0x58250:
+SuperNerdStanAfterBattleText:
text "The RUINS are from"
line "about 1500 years"
cont "ago."
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -47,9 +47,9 @@
end
TrainerMediumRebecca:
- trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript
+ trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script
-MediumRebeccaScript:
+.Script:
end_if_just_battled
opentext
writetext MediumRebeccaAfterBattleText
@@ -58,9 +58,9 @@
end
TrainerPsychicFranklin:
- trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript
+ trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script
-PsychicFranklinScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicFranklinAfterBattleText
@@ -69,9 +69,9 @@
end
TrainerMediumDoris:
- trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript
+ trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script
-MediumDorisScript:
+.Script:
end_if_just_battled
opentext
writetext MediumDorisAfterBattleText
@@ -80,9 +80,9 @@
end
TrainerPsychicJared:
- trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript
+ trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script
-PsychicJaredScript:
+.Script:
end_if_just_battled
opentext
writetext PsychicJaredAfterBattleText
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -20,9 +20,9 @@
jumptextfaceplayer SlowpokeWellB1FKurtText
TrainerGruntM29:
- trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, GruntM29Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_29, GRUNTM, GRUNTM_29, GruntM29SeenText, GruntM29BeatenText, 0, .Script
-GruntM29Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM29AfterBattleText
@@ -31,9 +31,9 @@
end
TrainerGruntM1:
- trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, GRUNTM_1, GruntM1SeenText, GruntM1BeatenText, 0, .Script
-GruntM1Script:
+.Script:
opentext
writetext TrainerGruntM1WhenTalkText
waitbutton
@@ -74,9 +74,9 @@
end
TrainerGruntM2:
- trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, GruntM2Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_2, GRUNTM, GRUNTM_2, GruntM2SeenText, GruntM2BeatenText, 0, .Script
-GruntM2Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM2AfterBattleText
@@ -85,9 +85,9 @@
end
TrainerGruntF1:
- trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, GruntF1Script
+ trainer EVENT_BEAT_ROCKET_GRUNTF_1, GRUNTF, GRUNTF_1, GruntF1SeenText, GruntF1BeatenText, 0, .Script
-GruntF1Script:
+.Script:
end_if_just_battled
opentext
writetext GruntF1AfterBattleText
--- a/maps/SproutTower1F.asm
+++ b/maps/SproutTower1F.asm
@@ -26,9 +26,9 @@
jumptextfaceplayer SproutTower1FTeacherText
TrainerSageChow:
- trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, SageChowScript
+ trainer EVENT_BEAT_SAGE_CHOW, SAGE, CHOW, SageChowSeenText, SageChowBeatenText, 0, .Script
-SageChowScript:
+.Script:
end_if_just_battled
opentext
writetext SageChowAfterBattleText
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -11,9 +11,9 @@
db 0
TrainerSageNico:
- trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript
+ trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, .Script
-SageNicoScript:
+.Script:
end_if_just_battled
opentext
writetext SageNicoAfterBattleText
@@ -22,9 +22,9 @@
end
TrainerSageEdmond:
- trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript
+ trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, .Script
-SageEdmondScript:
+.Script:
end_if_just_battled
opentext
writetext SageEdmondAfterBattleText
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -93,9 +93,9 @@
end
TrainerSageJin:
- trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, SageJinScript
+ trainer EVENT_BEAT_SAGE_JIN, SAGE, JIN, SageJinSeenText, SageJinBeatenText, 0, .Script
-SageJinScript:
+.Script:
end_if_just_battled
opentext
writetext SageJinAfterBattleText
@@ -104,9 +104,9 @@
end
TrainerSageTroy:
- trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, SageTroyScript
+ trainer EVENT_BEAT_SAGE_TROY, SAGE, TROY, SageTroySeenText, SageTroyBeatenText, 0, .Script
-SageTroyScript:
+.Script:
end_if_just_battled
opentext
writetext SageTroyAfterBattleText
@@ -115,9 +115,9 @@
end
TrainerSageNeal:
- trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, SageNealScript
+ trainer EVENT_BEAT_SAGE_NEAL, SAGE, NEAL, SageNealSeenText, SageNealBeatenText, 0, .Script
-SageNealScript:
+.Script:
end_if_just_battled
opentext
writetext SageNealAfterBattleText
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -481,9 +481,9 @@
end
TrainerScientistJed:
- trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, ScientistJedScript
+ trainer EVENT_BEAT_SCIENTIST_JED, SCIENTIST, JED, ScientistJedSeenText, ScientistJedBeatenText, 0, .Script
-ScientistJedScript:
+.Script:
end_if_just_battled
opentext
writetext ScientistJedAfterBattleText
@@ -492,9 +492,9 @@
end
TrainerGruntM16:
- trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, GruntM16Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_16, GRUNTM, GRUNTM_16, GruntM16SeenText, GruntM16BeatenText, 0, .Script
-GruntM16Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM16AfterBattleText
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -189,9 +189,9 @@
end
TrainerGruntM17:
- trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, GruntM17Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_17, GRUNTM, GRUNTM_17, GruntM17SeenText, GruntM17BeatenText, 0, .Script
-GruntM17Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM17AfterBattleText
@@ -200,9 +200,9 @@
end
TrainerGruntM18:
- trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, GruntM18Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_18, GRUNTM, GRUNTM_18, GruntM18SeenText, GruntM18BeatenText, 0, .Script
-GruntM18Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM18AfterBattleText
@@ -211,9 +211,9 @@
end
TrainerGruntM19:
- trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, GruntM19Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_19, GRUNTM, GRUNTM_19, GruntM19SeenText, GruntM19BeatenText, 0, .Script
-GruntM19Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM19AfterBattleText
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -152,9 +152,9 @@
end
TrainerScientistRoss:
- trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, ScientistRossScript
+ trainer EVENT_BEAT_SCIENTIST_ROSS, SCIENTIST, ROSS, ScientistRossSeenText, ScientistRossBeatenText, 0, .Script
-ScientistRossScript:
+.Script:
end_if_just_battled
opentext
writetext ScientistRossAfterBattleText
@@ -163,9 +163,9 @@
end
TrainerScientistMitch:
- trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, ScientistMitchScript
+ trainer EVENT_BEAT_SCIENTIST_MITCH, SCIENTIST, MITCH, ScientistMitchSeenText, ScientistMitchBeatenText, 0, .Script
-ScientistMitchScript:
+.Script:
end_if_just_battled
opentext
writetext ScientistMitchAfterBattleText
--- a/maps/TinTower9F.asm
+++ b/maps/TinTower9F.asm
@@ -11,11 +11,13 @@
TinTower9FHPUp:
itemball HP_UP
-UnknownText_0x185b8a:
+; unused
+TinTower9FUnusedHoOhText:
text "HO-OH: Shaoooh!"
done
-UnknownText_0x185b9b:
+; unused
+TinTower9FUnusedLugiaText:
text "LUGIA: Gyaaan!"
done
--- a/maps/UndergroundPathSwitchRoomEntrances.asm
+++ b/maps/UndergroundPathSwitchRoomEntrances.asm
@@ -206,9 +206,9 @@
end
TrainerGruntM11:
- trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, GruntM11Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_11, GRUNTM, GRUNTM_11, GruntM11SeenText, GruntM11BeatenText, 0, .Script
-GruntM11Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM11AfterBattleText
@@ -217,9 +217,9 @@
end
TrainerGruntM25:
- trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, GruntM25Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_25, GRUNTM, GRUNTM_25, GruntM25SeenText, GruntM25BeatenText, 0, .Script
-GruntM25Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM25AfterBattleText
@@ -228,9 +228,9 @@
end
TrainerBurglarDuncan:
- trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, BurglarDuncanScript
+ trainer EVENT_BEAT_BURGLAR_DUNCAN, BURGLAR, DUNCAN, BurglarDuncanSeenText, BurglarDuncanBeatenText, 0, .Script
-BurglarDuncanScript:
+.Script:
end_if_just_battled
opentext
writetext BurglarDuncanAfterBattleText
@@ -239,9 +239,9 @@
end
TrainerBurglarEddie:
- trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, BurglarEddieScript
+ trainer EVENT_BEAT_BURGLAR_EDDIE, BURGLAR, EDDIE, BurglarEddieSeenText, BurglarEddieBeatenText, 0, .Script
-BurglarEddieScript:
+.Script:
end_if_just_battled
opentext
writetext BurglarEddieAfterBattleText
@@ -250,9 +250,9 @@
end
TrainerGruntM13:
- trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, GruntM13Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_13, GRUNTM, GRUNTM_13, GruntM13SeenText, GruntM13BeatenText, 0, .Script
-GruntM13Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM13AfterBattleText
@@ -261,9 +261,9 @@
end
TrainerGruntF3:
- trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, GruntF3Script
+ trainer EVENT_BEAT_ROCKET_GRUNTF_3, GRUNTF, GRUNTF_3, GruntF3SeenText, GruntF3BeatenText, 0, .Script
-GruntF3Script:
+.Script:
end_if_just_battled
opentext
writetext GruntF3AfterBattleText
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -36,9 +36,9 @@
return
TrainerGruntM24:
- trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
-GruntM24Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM24AfterBattleText
@@ -47,9 +47,9 @@
end
TrainerGruntM14:
- trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, GRUNTM_14, GruntM14SeenText, GruntM14BeatenText, 0, .Script
-GruntM14Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM14AfterBattleText
@@ -58,9 +58,9 @@
end
TrainerGruntM15:
- trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script
+ trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, GRUNTM_15, GruntM15SeenText, GruntM15BeatenText, 0, .Script
-GruntM15Script:
+.Script:
end_if_just_battled
opentext
writetext GruntM15AfterBattleText
--- a/maps/UnionCave1F.asm
+++ b/maps/UnionCave1F.asm
@@ -17,9 +17,9 @@
db 0
TrainerPokemaniacLarry:
- trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, PokemaniacLarryScript
+ trainer EVENT_BEAT_POKEMANIAC_LARRY, POKEMANIAC, LARRY, PokemaniacLarrySeenText, PokemaniacLarryBeatenText, 0, .Script
-PokemaniacLarryScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacLarryAfterBattleText
@@ -28,9 +28,9 @@
end
TrainerHikerRussell:
- trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, HikerRussellScript
+ trainer EVENT_BEAT_HIKER_RUSSELL, HIKER, RUSSELL, HikerRussellSeenText, HikerRussellBeatenText, 0, .Script
-HikerRussellScript:
+.Script:
end_if_just_battled
opentext
writetext HikerRussellAfterBattleText
@@ -39,9 +39,9 @@
end
TrainerHikerDaniel:
- trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, HikerDanielScript
+ trainer EVENT_BEAT_HIKER_DANIEL, HIKER, DANIEL, HikerDanielSeenText, HikerDanielBeatenText, 0, .Script
-HikerDanielScript:
+.Script:
end_if_just_battled
opentext
writetext HikerDanielAfterBattleText
@@ -50,9 +50,9 @@
end
TrainerFirebreatherBill:
- trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, FirebreatherBillScript
+ trainer EVENT_BEAT_FIREBREATHER_BILL, FIREBREATHER, BILL, FirebreatherBillSeenText, FirebreatherBillBeatenText, 0, .Script
-FirebreatherBillScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherBillAfterBattleText
@@ -61,9 +61,9 @@
end
TrainerFirebreatherRay:
- trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, FirebreatherRayScript
+ trainer EVENT_BEAT_FIREBREATHER_RAY, FIREBREATHER, RAY, FirebreatherRaySeenText, FirebreatherRayBeatenText, 0, .Script
-FirebreatherRayScript:
+.Script:
end_if_just_battled
opentext
writetext FirebreatherRayAfterBattleText
--- a/maps/UnionCaveB1F.asm
+++ b/maps/UnionCaveB1F.asm
@@ -15,9 +15,9 @@
db 0
TrainerPokemaniacAndrew:
- trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, PokemaniacAndrewScript
+ trainer EVENT_BEAT_POKEMANIAC_ANDREW, POKEMANIAC, ANDREW, PokemaniacAndrewSeenText, PokemaniacAndrewBeatenText, 0, .Script
-PokemaniacAndrewScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacAndrewAfterBattleText
@@ -26,9 +26,9 @@
end
TrainerPokemaniacCalvin:
- trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, PokemaniacCalvinScript
+ trainer EVENT_BEAT_POKEMANIAC_CALVIN, POKEMANIAC, CALVIN, PokemaniacCalvinSeenText, PokemaniacCalvinBeatenText, 0, .Script
-PokemaniacCalvinScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacCalvinAfterBattleText
@@ -37,9 +37,9 @@
end
TrainerHikerPhillip:
- trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, HikerPhillipScript
+ trainer EVENT_BEAT_HIKER_PHILLIP, HIKER, PHILLIP, HikerPhillipSeenText, HikerPhillipBeatenText, 0, .Script
-HikerPhillipScript:
+.Script:
end_if_just_battled
opentext
writetext HikerPhillipAfterBattleText
@@ -48,9 +48,9 @@
end
TrainerHikerLeonard:
- trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, HikerLeonardScript
+ trainer EVENT_BEAT_HIKER_LEONARD, HIKER, LEONARD, HikerLeonardSeenText, HikerLeonardBeatenText, 0, .Script
-HikerLeonardScript:
+.Script:
end_if_just_battled
opentext
writetext HikerLeonardAfterBattleText
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -38,9 +38,9 @@
end
TrainerCooltrainermNick:
- trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, CooltrainermNickScript
+ trainer EVENT_BEAT_COOLTRAINERM_NICK, COOLTRAINERM, NICK, CooltrainermNickSeenText, CooltrainermNickBeatenText, 0, .Script
-CooltrainermNickScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainermNickAfterBattleText
@@ -49,9 +49,9 @@
end
TrainerCooltrainerfGwen:
- trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, CooltrainerfGwenScript
+ trainer EVENT_BEAT_COOLTRAINERF_GWEN, COOLTRAINERF, GWEN, CooltrainerfGwenSeenText, CooltrainerfGwenBeatenText, 0, .Script
-CooltrainerfGwenScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfGwenAfterBattleText
@@ -60,9 +60,9 @@
end
TrainerCooltrainerfEmma:
- trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, CooltrainerfEmmaScript
+ trainer EVENT_BEAT_COOLTRAINERF_EMMA, COOLTRAINERF, EMMA, CooltrainerfEmmaSeenText, CooltrainerfEmmaBeatenText, 0, .Script
-CooltrainerfEmmaScript:
+.Script:
end_if_just_battled
opentext
writetext CooltrainerfEmmaAfterBattleText
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -45,9 +45,9 @@
end
TrainerGentlemanGregory:
- trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, GentlemanGregoryScript
+ trainer EVENT_BEAT_GENTLEMAN_GREGORY, GENTLEMAN, GREGORY, GentlemanGregorySeenText, GentlemanGregoryBeatenText, 0, .Script
-GentlemanGregoryScript:
+.Script:
end_if_just_battled
opentext
writetext GentlemanGregoryAfterBattleText
@@ -56,9 +56,9 @@
end
TrainerGuitaristVincent:
- trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, GuitaristVincentScript
+ trainer EVENT_BEAT_GUITARIST_VINCENT, GUITARIST, VINCENT, GuitaristVincentSeenText, GuitaristVincentBeatenText, 0, .Script
-GuitaristVincentScript:
+.Script:
end_if_just_battled
opentext
writetext GuitaristVincentAfterBattleText
@@ -67,9 +67,9 @@
end
TrainerJugglerHorton:
- trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, JugglerHortonScript
+ trainer EVENT_BEAT_JUGGLER_HORTON, JUGGLER, HORTON, JugglerHortonSeenText, JugglerHortonBeatenText, 0, .Script
-JugglerHortonScript:
+.Script:
end_if_just_battled
opentext
writetext JugglerHortonAfterBattleText
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -67,9 +67,9 @@
jumpstd radiotowerrockets
TrainerBird_keeperRod:
- trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, Bird_keeperRodScript
+ trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script
-Bird_keeperRodScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperRodAfterBattleText
@@ -78,9 +78,9 @@
end
TrainerBird_keeperAbe:
- trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, Bird_keeperAbeScript
+ trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script
-Bird_keeperAbeScript:
+.Script:
end_if_just_battled
opentext
writetext Bird_keeperAbeAfterBattleText
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -111,9 +111,9 @@
return
TrainerSupernerdEric:
- trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, SupernerdEricScript
+ trainer EVENT_BEAT_SUPER_NERD_ERIC, SUPER_NERD, ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
-SupernerdEricScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdEricAfterBattleText
@@ -122,9 +122,9 @@
end
TrainerSupernerdTeru:
- trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, SupernerdTeruScript
+ trainer EVENT_BEAT_SUPER_NERD_TERU, SUPER_NERD, TERU, SupernerdTeruSeenText, SupernerdTeruBeatenText, 0, .Script
-SupernerdTeruScript:
+.Script:
end_if_just_battled
opentext
writetext SupernerdTeruAfterBattleText
@@ -133,9 +133,9 @@
end
TrainerPokemaniacIssac:
- trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, PokemaniacIssacScript
+ trainer EVENT_BEAT_POKEMANIAC_ISSAC, POKEMANIAC, ISSAC, PokemaniacIssacSeenText, PokemaniacIssacBeatenText, 0, .Script
-PokemaniacIssacScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacIssacAfterBattleText
@@ -144,9 +144,9 @@
end
TrainerPokemaniacDonald:
- trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, PokemaniacDonaldScript
+ trainer EVENT_BEAT_POKEMANIAC_DONALD, POKEMANIAC, DONALD, PokemaniacDonaldSeenText, PokemaniacDonaldBeatenText, 0, .Script
-PokemaniacDonaldScript:
+.Script:
end_if_just_battled
opentext
writetext PokemaniacDonaldAfterBattleText
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -69,9 +69,9 @@
end
TrainerSageGaku:
- trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript
+ trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, .Script
-SageGakuScript:
+.Script:
opentext
writetext UnknownText_0x98938
waitbutton
@@ -79,9 +79,9 @@
end
TrainerSageMasa:
- trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript
+ trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, .Script
-SageMasaScript:
+.Script:
opentext
writetext UnknownText_0x98a35
waitbutton
@@ -89,9 +89,9 @@
end
TrainerSageKoji:
- trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, SageKojiScript
+ trainer EVENT_BEAT_SAGE_KOJI, SAGE, KOJI, SageKojiSeenText, SageKojiBeatenText, 0, .Script
-SageKojiScript:
+.Script:
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x9861b
pause 10