pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Auto-label more map scripts

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-17 20:45:04 -05:00
parent 3ed016f9e0
commit 17058aaec2
90 changed files with 788 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maps/BlackthornGym1F.asm
View File

@@ -93,9 +93,9 @@ BlackthornGymClairScript:
end end
TrainerCooltrainermPaul: 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 end_if_just_battled
opentext opentext
writetext CooltrainermPaulAfterBattleText writetext CooltrainermPaulAfterBattleText
@@ -104,9 +104,9 @@ CooltrainermPaulScript:
end end
TrainerCooltrainermMike: 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 end_if_just_battled
opentext opentext
writetext CooltrainermMikeAfterBattleText writetext CooltrainermMikeAfterBattleText
@@ -115,9 +115,9 @@ CooltrainermMikeScript:
end end
TrainerCooltrainerfLola: 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 end_if_just_battled
opentext opentext
writetext CooltrainerfLolaAfterBattleText writetext CooltrainerfLolaAfterBattleText

8
maps/BlackthornGym2F.asm
View File

@@ -61,9 +61,9 @@ BlackthornGymBoulder:
jumpstd strengthboulder jumpstd strengthboulder
TrainerCooltrainermCody: 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 end_if_just_battled
opentext opentext
writetext CooltrainermCodyAfterBattleText writetext CooltrainermCodyAfterBattleText
@@ -72,9 +72,9 @@ CooltrainermCodyScript:
end end
TrainerCooltrainerfFran: 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 end_if_just_battled
opentext opentext
writetext CooltrainerfFranAfterBattleText writetext CooltrainerfFranAfterBattleText

4
maps/CeladonCity.asm
View File

@@ -160,8 +160,8 @@ CeladonCityTeacher2Text:
line "a sales clerk." line "a sales clerk."
done done
; possibly unused ; unused
UnknownText_0x1aa25b: CeladonCityUnusedPokeComCenterText:
text "I love being" text "I love being"
line "surrounded by tall" line "surrounded by tall"
cont "buildings!" cont "buildings!"

16
maps/CeladonDeptStore3F.asm
View File

@@ -22,19 +22,19 @@ ClerkScript_0x70d29:
CeladonDeptStore3FYoungsterScript: CeladonDeptStore3FYoungsterScript:
jumptextfaceplayer CeladonDeptStore3FYoungsterText jumptextfaceplayer CeladonDeptStore3FYoungsterText
GameboyKidScript_0x70d34: CeladonDeptStore3FGameboyKid1Script:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x70d86 writetext CeladonDeptStore3FGameboyKid1Text
waitbutton waitbutton
closetext closetext
spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
end end
GameboyKidScript_0x70d3f: CeladonDeptStore3FGameboyKid2Script:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x70dc7 writetext CeladonDeptStore3FGameboyKid2Text
waitbutton waitbutton
closetext closetext
spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
@@ -57,7 +57,7 @@ CeladonDeptStore3FYoungsterText:
line "on…" line "on…"
done done
UnknownText_0x70d86: CeladonDeptStore3FGameboyKid1Text:
text "Uh-oh! I traded my" text "Uh-oh! I traded my"
line "#MON without" line "#MON without"
@@ -65,7 +65,7 @@ UnknownText_0x70d86:
line "GRADE from it." line "GRADE from it."
done done
UnknownText_0x70dc7: CeladonDeptStore3FGameboyKid2Text:
text "Yeah! I'm finally" text "Yeah! I'm finally"
line "getting a PORYGON!" line "getting a PORYGON!"
@@ -116,6 +116,6 @@ CeladonDeptStore3F_MapEventHeader:
db 5 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_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_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, 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, GameboyKidScript_0x70d3f, -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 person_event SPRITE_SUPER_NERD, 4, 13, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeladonDeptStore3FSuperNerdScript, -1

13
maps/CeladonDeptStore6F.asm
View File

@@ -20,7 +20,7 @@ CeladonDeptStore6FSuperNerdScript:
CeladonDeptStore6FYoungsterScript: CeladonDeptStore6FYoungsterScript:
jumptextfaceplayer CeladonDeptStore6FYoungsterText jumptextfaceplayer CeladonDeptStore6FYoungsterText
CeladonVendingMachine: CeladonDeptStore6FVendingMachine:
opentext opentext
writetext CeladonVendingText writetext CeladonVendingText
.Start: .Start:
@@ -98,7 +98,8 @@ CeladonVendingMachine:
CeladonDeptStore6FDirectory: CeladonDeptStore6FDirectory:
jumptext CeladonDeptStore6FDirectoryText jumptext CeladonDeptStore6FDirectoryText
UnknownScript_0x7124d: ; unused
CeladonDeptStore6FElevatorButton:
jumpstd elevatorbutton jumpstd elevatorbutton
CeladonVendingText: CeladonVendingText:
@@ -162,10 +163,10 @@ CeladonDeptStore6F_MapEventHeader:
db 6 db 6
signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory
signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton
signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine signpost 1, 8, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine signpost 1, 9, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine signpost 1, 10, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine signpost 1, 11, SIGNPOST_UP, CeladonDeptStore6FVendingMachine
.PersonEvents: .PersonEvents:
db 2 db 2

18
maps/CeladonDeptStoreElevator.asm
View File

@@ -5,20 +5,19 @@ CeladonDeptStoreElevator_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
MapCeladonDeptStoreElevatorSignpost0Script: CeladonDeptStoreElevatorScript:
opentext opentext
elevator Elevator_0x713be elevator CeladonDeptStoreElevatorData
closetext closetext
iffalse UnknownScript_0x713bd iffalse .Done
pause 5 pause 5
playsound SFX_ELEVATOR playsound SFX_ELEVATOR
earthquake 60 earthquake 60
waitsfx waitsfx
UnknownScript_0x713bd: .Done:
end end
CeladonDeptStoreElevatorData:
Elevator_0x713be:
db 6 ; floors db 6 ; floors
elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F elevfloor FLOOR_1F, 4, CELADON_DEPT_STORE_1F
elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F elevfloor FLOOR_2F, 3, CELADON_DEPT_STORE_2F
@@ -28,22 +27,21 @@ Elevator_0x713be:
elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F elevfloor FLOOR_6F, 2, CELADON_DEPT_STORE_6F
db $ff ; end db $ff ; end
CeladonDeptStoreElevator_MapEventHeader: CeladonDeptStoreElevator_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
.Warps: .Warps:
db 2 db 2
warp_def $3, $1, 255, CELADON_DEPT_STORE_1F warp_def $3, $1, -1, CELADON_DEPT_STORE_1F
warp_def $3, $2, 255, CELADON_DEPT_STORE_1F warp_def $3, $2, -1, CELADON_DEPT_STORE_1F
.XYTriggers: .XYTriggers:
db 0 db 0
.Signposts: .Signposts:
db 1 db 1
signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script signpost 0, 3, SIGNPOST_READ, CeladonDeptStoreElevatorScript
.PersonEvents: .PersonEvents:
db 0 db 0

174
maps/CeladonGameCorner.asm
View File

@@ -16,77 +16,77 @@ CeladonGameCorner_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
ClerkScript_0x7211d: CeladonGameCornerClerkScript:
jumpstd gamecornercoinvendor jumpstd gamecornercoinvendor
CeladonGameCornerReceptionistScript: CeladonGameCornerReceptionistScript:
jumptextfaceplayer CeladonGameCornerReceptionistText jumptextfaceplayer CeladonGameCornerReceptionistText
PokefanMScript_0x72123: CeladonGameCornerPokefanMScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x72215 writetext CeladonGameCornerPokefanMText
waitbutton waitbutton
closetext closetext
spriteface CELADONGAMECORNER_POKEFAN_M, LEFT spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
end end
TeacherScript_0x7212e: CeladonGameCornerTeacherScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x72242 writetext CeladonGameCornerTeacherText
waitbutton waitbutton
closetext closetext
spriteface CELADONGAMECORNER_TEACHER, RIGHT spriteface CELADONGAMECORNER_TEACHER, RIGHT
end end
FishingGuruScript_0x72139: CeladonGameCornerFishingGuruScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x72295 writetext CeladonGameCornerFishingGuruText
waitbutton waitbutton
closetext closetext
spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
end end
FisherScript_0x72144: CeladonGameCornerFisherScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
iftrue .UnknownScript_0x72169 iftrue .GotCoins
writetext UnknownText_0x722dc writetext CeladonGameCornerFisherText1
buttonsound buttonsound
checkitem COIN_CASE checkitem COIN_CASE
iffalse UnknownScript_0x7217b iffalse .NoCoinCase
checkcoins 9998 checkcoins 9998
if_equal $0, UnknownScript_0x72184 if_equal $0, .FullCoinCase
stringtotext .coinname, $1 stringtotext .coinname, $1
scall .UnknownScript_0x72172 scall .GiveCoins
givecoins 18 givecoins 18
setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON
.UnknownScript_0x72169: .GotCoins:
writetext UnknownText_0x72345 writetext CeladonGameCornerFisherText2
waitbutton waitbutton
closetext closetext
spriteface LAST_TALKED, LEFT spriteface LAST_TALKED, LEFT
end end
.UnknownScript_0x72172: .GiveCoins:
jumpstd receiveitem jumpstd receiveitem
end end
.coinname .coinname
db "COIN@" db "COIN@"
UnknownScript_0x7217b: .NoCoinCase:
writetext UnknownText_0x7238a writetext CeladonGameCornerFisherNoCoinCaseText
waitbutton waitbutton
closetext closetext
spriteface LAST_TALKED, LEFT spriteface LAST_TALKED, LEFT
end end
UnknownScript_0x72184: .FullCoinCase:
writetext UnknownText_0x723d9 writetext CeladonGameCornerFisherFullCoinCaseText
waitbutton waitbutton
closetext closetext
spriteface LAST_TALKED, LEFT spriteface LAST_TALKED, LEFT
@@ -95,45 +95,45 @@ UnknownScript_0x72184:
CeladonGymGuyScript: CeladonGymGuyScript:
jumptextfaceplayer CeladonGymGuyText jumptextfaceplayer CeladonGymGuyText
GrampsScript_0x72190: CeladonGameCornerGrampsScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x724ad writetext CeladonGameCornerGrampsText
waitbutton waitbutton
closetext closetext
spriteface CELADONGAMECORNER_GRAMPS, LEFT spriteface CELADONGAMECORNER_GRAMPS, LEFT
end end
MapCeladonGameCornerSignpost36Script: CeladonGameCornerPoster1Script:
jumptext UnknownText_0x724f3 jumptext CeladonGameCornerPoster1Text
MapCeladonGameCornerSignpost37Script: CeladonGameCornerPoster2Script:
jumptext UnknownText_0x72521 jumptext CeladonGameCornerPoster2Text
MapCeladonGameCornerSignpost35Script: CeladonGameCornerLuckySlotMachineScript:
random $6 random $6
if_equal $0, MapCeladonGameCornerSignpost16Script if_equal $0, CeladonGameCornerSlotMachineScript
refreshscreen $0 refreshscreen $0
writebyte $0 writebyte $0
special Special_SlotMachine special Special_SlotMachine
closetext closetext
end end
MapCeladonGameCornerSignpost16Script: CeladonGameCornerSlotMachineScript:
refreshscreen $0 refreshscreen $0
writebyte $1 writebyte $1
special Special_SlotMachine special Special_SlotMachine
closetext closetext
end end
MapCeladonGameCornerSignpost11Script: CeladonGameCornerCardFlipScript:
refreshscreen $0 refreshscreen $0
special Special_CardFlip special Special_CardFlip
closetext closetext
end end
MapCeladonGameCornerSignpost32Script: CeladonGameCornerLighterScript:
jumptext UnknownText_0x7254f jumptext CeladonGameCornerLighterText
MapCeladonGameCornerSignpost9Script: MapCeladonGameCornerSignpost9Script:
opentext opentext
@@ -159,13 +159,13 @@ CeladonGameCornerReceptionistText:
line "next door." line "next door."
done done
UnknownText_0x72215: CeladonGameCornerPokefanMText:
text "The slot machines" text "The slot machines"
line "are all state of" line "are all state of"
cont "the art." cont "the art."
done done
UnknownText_0x72242: CeladonGameCornerTeacherText:
text "It's this machine" text "It's this machine"
line "I want." line "I want."
@@ -176,7 +176,7 @@ UnknownText_0x72242:
line "today." line "today."
done done
UnknownText_0x72295: CeladonGameCornerFishingGuruText:
text "I think this slot" text "I think this slot"
line "machine will pay" line "machine will pay"
cont "out…" cont "out…"
@@ -185,7 +185,7 @@ UnknownText_0x72295:
line "among machines." line "among machines."
done done
UnknownText_0x722dc: CeladonGameCornerFisherText1:
text "Gahahaha!" text "Gahahaha!"
para "The coins just" para "The coins just"
@@ -198,7 +198,7 @@ UnknownText_0x722dc:
line "with you!" line "with you!"
done done
UnknownText_0x72345: CeladonGameCornerFisherText2:
text "Gahahaha!" text "Gahahaha!"
para "It makes me feel" para "It makes me feel"
@@ -208,7 +208,7 @@ UnknownText_0x72345:
line "people!" line "people!"
done done
UnknownText_0x7238a: CeladonGameCornerFisherNoCoinCaseText:
text "Hey, you don't" text "Hey, you don't"
line "have a COIN CASE." line "have a COIN CASE."
@@ -217,7 +217,7 @@ UnknownText_0x7238a:
cont "coins, kid?" cont "coins, kid?"
done done
UnknownText_0x723d9: CeladonGameCornerFisherFullCoinCaseText:
text "Hey, your COIN" text "Hey, your COIN"
line "CASE is full, kid." line "CASE is full, kid."
@@ -241,7 +241,7 @@ CeladonGymGuyText:
line "enough coins yet…" line "enough coins yet…"
done done
UnknownText_0x724ad: CeladonGameCornerGrampsText:
text "Hmmm… The odds are" text "Hmmm… The odds are"
line "surely better for" line "surely better for"
@@ -249,7 +249,7 @@ UnknownText_0x724ad:
line "but… What to do?" line "but… What to do?"
done done
UnknownText_0x724f3: CeladonGameCornerPoster1Text:
text "Hey!" text "Hey!"
para "Underneath this" para "Underneath this"
@@ -258,7 +258,7 @@ UnknownText_0x724f3:
para "There's nothing!" para "There's nothing!"
done done
UnknownText_0x72521: CeladonGameCornerPoster2Text:
text "Hey!" text "Hey!"
para "Underneath this" para "Underneath this"
@@ -267,7 +267,7 @@ UnknownText_0x72521:
para "There's nothing!" para "There's nothing!"
done done
UnknownText_0x7254f: CeladonGameCornerLighterText:
text "There's a lighter" text "There's a lighter"
line "here." line "here."
done done
@@ -295,53 +295,53 @@ CeladonGameCorner_MapEventHeader:
.Signposts: .Signposts:
db 38 db 38
signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 6, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 7, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 8, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 9, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 10, 1, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script signpost 11, 1, SIGNPOST_LEFT, CeladonGameCornerCardFlipScript
signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 6, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 7, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 8, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script
signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script signpost 10, 6, SIGNPOST_READ, CeladonGameCornerCardFlipScript
signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script signpost 11, 6, SIGNPOST_RIGHT, CeladonGameCornerCardFlipScript
signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 6, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 7, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 8, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 9, 7, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script signpost 10, 7, SIGNPOST_READ, CeladonGameCornerSlotMachineScript
signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script signpost 11, 7, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 6, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 7, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 8, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 9, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 10, 12, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script signpost 11, 12, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 6, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 7, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 8, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 9, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 10, 13, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script signpost 11, 13, SIGNPOST_LEFT, CeladonGameCornerLuckySlotMachineScript
signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 6, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 7, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script signpost 8, 18, SIGNPOST_READ, CeladonGameCornerLighterScript
signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 9, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script signpost 10, 18, SIGNPOST_READ, CeladonGameCornerLuckySlotMachineScript
signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script signpost 11, 18, SIGNPOST_RIGHT, CeladonGameCornerLuckySlotMachineScript
signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script signpost 0, 15, SIGNPOST_READ, CeladonGameCornerPoster1Script
signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script signpost 0, 9, SIGNPOST_READ, CeladonGameCornerPoster2Script
.PersonEvents: .PersonEvents:
db 9 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_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_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, TeacherScript_0x7212e, -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, FishingGuruScript_0x72139, -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, FisherScript_0x72144, -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, FisherScript_0x72144, -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_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

20
maps/CeladonGym.asm
View File

@@ -50,9 +50,9 @@ UnknownScript_0x72aae:
end end
TrainerLassMichelle: 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 end_if_just_battled
opentext opentext
writetext LassMichelleAfterBattleText writetext LassMichelleAfterBattleText
@@ -61,9 +61,9 @@ LassMichelleScript:
end end
TrainerPicnickerTanya: 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 end_if_just_battled
opentext opentext
writetext PicnickerTanyaAfterBattleText writetext PicnickerTanyaAfterBattleText
@@ -72,9 +72,9 @@ PicnickerTanyaScript:
end end
TrainerBeautyJulia: 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 end_if_just_battled
opentext opentext
writetext BeautyJuliaAfterBattleText writetext BeautyJuliaAfterBattleText
@@ -83,9 +83,9 @@ BeautyJuliaScript:
end end
TrainerTwinsJoandzoe1: 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 end_if_just_battled
opentext opentext
writetext TwinsJoandzoe1AfterBattleText writetext TwinsJoandzoe1AfterBattleText
@@ -94,9 +94,9 @@ TwinsJoandzoe1Script:
end end
TrainerTwinsJoandzoe2: 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 end_if_just_battled
opentext opentext
writetext TwinsJoandzoe2AfterBattleText writetext TwinsJoandzoe2AfterBattleText

68
maps/CeruleanCity.asm
View File

@@ -18,18 +18,18 @@ CeruleanCity_MapScriptHeader:
setflag ENGINE_FLYPOINT_CERULEAN setflag ENGINE_FLYPOINT_CERULEAN
return return
CooltrainerMScript_0x184009: CeruleanCityCooltrainerMScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_RETURNED_MACHINE_PART checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184017 iftrue .ReturnedMachinePart
writetext UnknownText_0x1840bc writetext CeruleanCityCooltrainerMText1
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x184017: .ReturnedMachinePart:
writetext UnknownText_0x184144 writetext CeruleanCityCooltrainerMText2
waitbutton waitbutton
closetext closetext
end end
@@ -45,15 +45,15 @@ CeruleanCitySlowbro:
closetext closetext
end end
CooltrainerFScript_0x18402a: CeruleanCityCooltrainerFScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x1841fa writetext CeruleanCityCooltrainerFText1
waitbutton waitbutton
closetext closetext
spriteface CERULEANCITY_COOLTRAINER_F, LEFT spriteface CERULEANCITY_COOLTRAINER_F, LEFT
opentext opentext
writetext UnknownText_0x184229 writetext CeruleanCityCooltrainerFText2
waitbutton waitbutton
closetext closetext
opentext opentext
@@ -62,41 +62,41 @@ CooltrainerFScript_0x18402a:
waitbutton waitbutton
closetext closetext
opentext opentext
writetext UnknownText_0x18424b writetext CeruleanCityCooltrainerFText3
waitbutton waitbutton
closetext closetext
end end
FisherScript_0x18404a: CeruleanCityFisherScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_RETURNED_MACHINE_PART checkevent EVENT_RETURNED_MACHINE_PART
iftrue UnknownScript_0x184058 iftrue .ReturnedMachinePart
checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
iftrue UnknownScript_0x18405e iftrue .MetCeruleanRocket
UnknownScript_0x184058: .ReturnedMachinePart:
writetext UnknownText_0x18424e writetext CeruleanCityFisherText
waitbutton waitbutton
closetext closetext
end end
UnknownScript_0x18405e: .MetCeruleanRocket:
writetext UnknownText_0x184275 writetext CeruleanCityFisherRocketTipText
waitbutton waitbutton
closetext closetext
end end
YoungsterScript_0x184064: CeruleanCityYoungsterScript:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x1842a9 writetext CeruleanCityYoungsterText1
waitbutton waitbutton
closetext closetext
checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY checkevent EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY
iffalse UnknownScript_0x184072 iffalse .BerserkGenePingsItemfinder
end end
UnknownScript_0x184072: .BerserkGenePingsItemfinder:
waitsfx waitsfx
playsound SFX_SECOND_PART_OF_ITEMFINDER playsound SFX_SECOND_PART_OF_ITEMFINDER
waitsfx waitsfx
@@ -117,7 +117,7 @@ UnknownScript_0x184072:
showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
spriteface CERULEANCITY_YOUNGSTER, LEFT spriteface CERULEANCITY_YOUNGSTER, LEFT
opentext opentext
writetext UnknownText_0x1842ee writetext CeruleanCityYoungsterText2
waitbutton waitbutton
closetext closetext
end end
@@ -149,7 +149,7 @@ CeruleanCityMartSign:
CeruleanCityHiddenBerserkGene: CeruleanCityHiddenBerserkGene:
dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE
UnknownText_0x1840bc: CeruleanCityCooltrainerMText1:
text "KANTO's POWER" text "KANTO's POWER"
line "PLANT?" line "PLANT?"
@@ -164,7 +164,7 @@ UnknownText_0x1840bc:
cont "some sort there." cont "some sort there."
done done
UnknownText_0x184144: CeruleanCityCooltrainerMText2:
text "You're collecting" text "You're collecting"
line "every single kind" line "every single kind"
cont "of #MON?" cont "of #MON?"
@@ -186,34 +186,34 @@ CeruleanCitySlowbroText:
text "SLOWBRO: Yarah?" text "SLOWBRO: Yarah?"
done done
UnknownText_0x1841fa: CeruleanCityCooltrainerFText1:
text "My SLOWBRO and I" text "My SLOWBRO and I"
line "make an awesome" line "make an awesome"
cont "combination!" cont "combination!"
done done
UnknownText_0x184229: CeruleanCityCooltrainerFText2:
text "SLOWBRO, show me" text "SLOWBRO, show me"
line "your CONFUSION!" line "your CONFUSION!"
done done
UnknownText_0x18424b: CeruleanCityCooltrainerFText3:
text "…" text "…"
done done
UnknownText_0x18424e: CeruleanCityFisherText:
text "I'm a huge fan of" text "I'm a huge fan of"
line "CERULEAN GYM's" line "CERULEAN GYM's"
cont "MISTY." cont "MISTY."
done done
UnknownText_0x184275: CeruleanCityFisherRocketTipText:
text "I saw this shady" text "I saw this shady"
line "guy go off toward" line "guy go off toward"
cont "CERULEAN's CAPE." cont "CERULEAN's CAPE."
done done
UnknownText_0x1842a9: CeruleanCityYoungsterText1:
text "There used to be a" text "There used to be a"
line "cave here that had" line "cave here that had"
@@ -221,7 +221,7 @@ UnknownText_0x1842a9:
line "#MON in it." line "#MON in it."
done done
UnknownText_0x1842ee: CeruleanCityYoungsterText2:
text "Ayuh?" text "Ayuh?"
para "My ITEMFINDER is" para "My ITEMFINDER is"
@@ -305,9 +305,9 @@ CeruleanCity_MapEventHeader:
.PersonEvents: .PersonEvents:
db 6 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_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_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_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, FisherScript_0x18404a, -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, YoungsterScript_0x184064, -1 person_event SPRITE_YOUNGSTER, 12, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, CeruleanCityYoungsterScript, -1

12
maps/CeruleanGym.asm
View File

@@ -86,9 +86,9 @@ MistyScript_0x188432:
end end
TrainerSwimmerfDiana: 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 end_if_just_battled
opentext opentext
writetext SwimmerfDianaAfterBattleText writetext SwimmerfDianaAfterBattleText
@@ -97,9 +97,9 @@ SwimmerfDianaScript:
end end
TrainerSwimmerfBriana: 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 end_if_just_battled
opentext opentext
writetext SwimmerfBrianaAfterBattleText writetext SwimmerfBrianaAfterBattleText
@@ -108,9 +108,9 @@ SwimmerfBrianaScript:
end end
TrainerSwimmermParker: 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 end_if_just_battled
opentext opentext
writetext SwimmermParkerAfterBattleText writetext SwimmermParkerAfterBattleText

20
maps/DanceTheatre.asm
View File

@@ -17,9 +17,9 @@ DanceTheatre_MapScriptHeader:
db 0 db 0
TrainerKimono_girlNaoko2: 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 end_if_just_battled
opentext opentext
writetext Kimono_girlNaoko2AfterBattleText writetext Kimono_girlNaoko2AfterBattleText
@@ -28,9 +28,9 @@ Kimono_girlNaoko2Script:
end end
TrainerKimono_girlSayo: 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 end_if_just_battled
opentext opentext
writetext Kimono_girlSayoAfterBattleText writetext Kimono_girlSayoAfterBattleText
@@ -39,9 +39,9 @@ Kimono_girlSayoScript:
end end
TrainerKimono_girlZuki: 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 end_if_just_battled
opentext opentext
writetext Kimono_girlZukiAfterBattleText writetext Kimono_girlZukiAfterBattleText
@@ -50,9 +50,9 @@ Kimono_girlZukiScript:
end end
TrainerKimono_girlKuni: 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 end_if_just_battled
opentext opentext
writetext Kimono_girlKuniAfterBattleText writetext Kimono_girlKuniAfterBattleText
@@ -61,9 +61,9 @@ Kimono_girlKuniScript:
end end
TrainerKimono_girlMiki: 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 end_if_just_battled
opentext opentext
writetext Kimono_girlMikiAfterBattleText writetext Kimono_girlMikiAfterBattleText

20
maps/DarkCaveBlackthornEntrance.asm
View File

@@ -10,20 +10,20 @@ DarkCaveBlackthornEntrance_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
PharmacistScript_0x18c720: DarkCaveBlackthornEntrancePharmacistScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
iftrue UnknownScript_0x18c735 iftrue .GotBlackglasses
writetext UnknownText_0x18c73f writetext DarkCaveBlackthornEntrancePharmacistText1
buttonsound buttonsound
verbosegiveitem BLACKGLASSES verbosegiveitem BLACKGLASSES
iffalse UnknownScript_0x18c739 iffalse .PackFull
setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE setevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
UnknownScript_0x18c735: .GotBlackglasses:
writetext UnknownText_0x18c80c writetext DarkCaveBlackthornEntrancePharmacistText2
waitbutton waitbutton
UnknownScript_0x18c739: .PackFull:
closetext closetext
end end
@@ -33,7 +33,7 @@ DarkCaveBlackthornEntranceRevive:
DarkCaveBlackthornEntranceTMSnore: DarkCaveBlackthornEntranceTMSnore:
itemball TM_SNORE itemball TM_SNORE
UnknownText_0x18c73f: DarkCaveBlackthornEntrancePharmacistText1:
text "Whoa! You startled" text "Whoa! You startled"
line "me there!" line "me there!"
@@ -55,7 +55,7 @@ UnknownText_0x18c73f:
cont "you saw me, OK?" cont "you saw me, OK?"
done done
UnknownText_0x18c80c: DarkCaveBlackthornEntrancePharmacistText2:
text "BLACKGLASSES ups" text "BLACKGLASSES ups"
line "the power of dark-" line "the power of dark-"
cont "type moves." cont "type moves."
@@ -78,6 +78,6 @@ DarkCaveBlackthornEntrance_MapEventHeader:
.PersonEvents: .PersonEvents:
db 3 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, 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 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

16
maps/DragonsDenB1F.asm
View File

@@ -84,9 +84,9 @@ DragonsDenB1F_ClairTrigger:
end end
TrainerCooltrainermDarin: 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 end_if_just_battled
opentext opentext
writetext CooltrainermDarinAfterBattleText writetext CooltrainermDarinAfterBattleText
@@ -95,9 +95,9 @@ CooltrainermDarinScript:
end end
TrainerCooltrainerfCara: 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 end_if_just_battled
opentext opentext
writetext CooltrainerfCaraAfterBattleText writetext CooltrainerfCaraAfterBattleText
@@ -106,9 +106,9 @@ CooltrainerfCaraScript:
end end
TrainerTwinsLeaandpia1: 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 end_if_just_battled
opentext opentext
writetext TwinsLeaandpia1AfterBattleText writetext TwinsLeaandpia1AfterBattleText
@@ -117,9 +117,9 @@ TwinsLeaandpia1Script:
end end
TrainerTwinsLeaandpia2: 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 end_if_just_battled
opentext opentext
writetext TwinsLeaandpia2AfterBattleText writetext TwinsLeaandpia2AfterBattleText

16
maps/EarlsPokemonAcademy.asm
View File

@@ -41,19 +41,19 @@ AcademyEarl:
EarlsPokemonAcademyYoungster1Script: EarlsPokemonAcademyYoungster1Script:
jumptextfaceplayer EarlsPokemonAcademyYoungster1Text jumptextfaceplayer EarlsPokemonAcademyYoungster1Text
GameboyKidScript_0x68a86: EarlsPokemonAcademyGameboyKid1Script:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x68dda writetext EarlsPokemonAcademyGameboyKid1Text
waitbutton waitbutton
closetext closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
end end
GameboyKidScript_0x68a91: EarlsPokemonAcademyGameboyKid2Script:
faceplayer faceplayer
opentext opentext
writetext UnknownText_0x68e07 writetext EarlsPokemonAcademyGameboyKid2Text
waitbutton waitbutton
closetext closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
@@ -241,13 +241,13 @@ EarlsPokemonAcademyYoungster1Text:
cont "blackboard too." cont "blackboard too."
done done
UnknownText_0x68dda: EarlsPokemonAcademyGameboyKid1Text:
text "I traded my best" text "I traded my best"
line "#MON to the" line "#MON to the"
cont "guy beside me." cont "guy beside me."
done done
UnknownText_0x68e07: EarlsPokemonAcademyGameboyKid2Text:
text "Huh? The #MON I" text "Huh? The #MON I"
line "just got is hold-" line "just got is hold-"
cont "ing something!" cont "ing something!"
@@ -435,7 +435,7 @@ EarlsPokemonAcademy_MapEventHeader:
db 6 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_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_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, 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, GameboyKidScript_0x68a91, -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_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 person_event SPRITE_POKEDEX, 4, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, AcademyNotebook, -1

16
maps/EcruteakGym.asm
View File

@@ -98,9 +98,9 @@ EcruteakGymClosed:
end end
TrainerSageJeffrey: 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 end_if_just_battled
opentext opentext
writetext SageJeffreyAfterBattleText writetext SageJeffreyAfterBattleText
@@ -109,9 +109,9 @@ SageJeffreyScript:
end end
TrainerSagePing: 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 end_if_just_battled
opentext opentext
writetext SagePingAfterBattleText writetext SagePingAfterBattleText
@@ -120,9 +120,9 @@ SagePingScript:
end end
TrainerMediumMartha: 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 end_if_just_battled
opentext opentext
writetext MediumMarthaAfterBattleText writetext MediumMarthaAfterBattleText
@@ -131,9 +131,9 @@ MediumMarthaScript:
end end
TrainerMediumGrace: 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 end_if_just_battled
opentext opentext
writetext MediumGraceAfterBattleText writetext MediumGraceAfterBattleText

40
maps/FastShipB1F.asm
View File

@@ -94,9 +94,9 @@ UnknownScript_0x767a0:
end end
TrainerSailorJeff: 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 end_if_just_battled
opentext opentext
writetext SailorJeffAfterBattleText writetext SailorJeffAfterBattleText
@@ -105,9 +105,9 @@ SailorJeffScript:
end end
TrainerPicnickerDebra: 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 end_if_just_battled
opentext opentext
writetext PicnickerDebraAfterBattleText writetext PicnickerDebraAfterBattleText
@@ -116,9 +116,9 @@ PicnickerDebraScript:
end end
TrainerJugglerFritz: 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 end_if_just_battled
opentext opentext
writetext JugglerFritzAfterBattleText writetext JugglerFritzAfterBattleText
@@ -127,9 +127,9 @@ JugglerFritzScript:
end end
TrainerSailorGarrett: 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 end_if_just_battled
opentext opentext
writetext SailorGarrettAfterBattleText writetext SailorGarrettAfterBattleText
@@ -138,9 +138,9 @@ SailorGarrettScript:
end end
TrainerFisherJonah: 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 end_if_just_battled
opentext opentext
writetext FisherJonahAfterBattleText writetext FisherJonahAfterBattleText
@@ -149,9 +149,9 @@ FisherJonahScript:
end end
TrainerBlackbeltWai: 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 end_if_just_battled
opentext opentext
writetext BlackbeltWaiAfterBattleText writetext BlackbeltWaiAfterBattleText
@@ -160,9 +160,9 @@ BlackbeltWaiScript:
end end
TrainerSailorKenneth: 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 end_if_just_battled
opentext opentext
writetext SailorKennethAfterBattleText writetext SailorKennethAfterBattleText
@@ -171,9 +171,9 @@ SailorKennethScript:
end end
TrainerTeacherShirley: 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 end_if_just_battled
opentext opentext
writetext TeacherShirleyAfterBattleText writetext TeacherShirleyAfterBattleText
@@ -182,9 +182,9 @@ TeacherShirleyScript:
end end
TrainerSchoolboyNate: 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 end_if_just_battled
opentext opentext
writetext SchoolboyNateAfterBattleText writetext SchoolboyNateAfterBattleText
@@ -193,9 +193,9 @@ SchoolboyNateScript:
end end
TrainerSchoolboyRicky: 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 end_if_just_battled
opentext opentext
writetext SchoolboyRickyAfterBattleText writetext SchoolboyRickyAfterBattleText

24
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@@ -15,9 +15,9 @@ FastShipCabins_NNW_NNE_NE_MapScriptHeader:
db 0 db 0
TrainerCooltrainermSean: 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 end_if_just_battled
opentext opentext
writetext CooltrainermSeanAfterBattleText writetext CooltrainermSeanAfterBattleText
@@ -26,9 +26,9 @@ CooltrainermSeanScript:
end end
TrainerCooltrainerfCarol: 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 end_if_just_battled
opentext opentext
writetext CooltrainerfCarolAfterBattleText writetext CooltrainerfCarolAfterBattleText
@@ -37,9 +37,9 @@ CooltrainerfCarolScript:
end end
TrainerPokemaniacEthan: 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 end_if_just_battled
opentext opentext
writetext PokemaniacEthanAfterBattleText writetext PokemaniacEthanAfterBattleText
@@ -48,9 +48,9 @@ PokemaniacEthanScript:
end end
TrainerHikerNoland: 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 end_if_just_battled
opentext opentext
writetext HikerNolandAfterBattleText writetext HikerNolandAfterBattleText
@@ -59,9 +59,9 @@ HikerNolandScript:
end end
TrainerGentlemanEdward: 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 end_if_just_battled
opentext opentext
writetext GentlemanEdwardAfterBattleText writetext GentlemanEdwardAfterBattleText
@@ -70,9 +70,9 @@ GentlemanEdwardScript:
end end
TrainerBurglarCorey: 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 end_if_just_battled
opentext opentext
writetext BurglarCoreyAfterBattleText writetext BurglarCoreyAfterBattleText

28
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@@ -141,9 +141,9 @@ TwinScript_0x75f6d:
end end
TrainerPokefanmColin: 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 end_if_just_battled
opentext opentext
writetext PokefanmColinAfterBattleText writetext PokefanmColinAfterBattleText
@@ -152,9 +152,9 @@ PokefanmColinScript:
end end
TrainerTwinsMegandpeg1: 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 end_if_just_battled
opentext opentext
writetext TwinsMegandpeg1AfterBattleText writetext TwinsMegandpeg1AfterBattleText
@@ -163,9 +163,9 @@ TwinsMegandpeg1Script:
end end
TrainerTwinsMegandpeg2: 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 end_if_just_battled
opentext opentext
writetext TwinsMegandpeg2AfterBattleText writetext TwinsMegandpeg2AfterBattleText
@@ -174,9 +174,9 @@ TwinsMegandpeg2Script:
end end
TrainerPsychicRodney: 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 end_if_just_battled
opentext opentext
writetext PsychicRodneyAfterBattleText writetext PsychicRodneyAfterBattleText
@@ -185,9 +185,9 @@ PsychicRodneyScript:
end end
TrainerPokefanmJeremy: 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 end_if_just_battled
opentext opentext
writetext PokefanmJeremyAfterBattleText writetext PokefanmJeremyAfterBattleText
@@ -196,9 +196,9 @@ PokefanmJeremyScript:
end end
TrainerPokefanfGeorgia: 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 end_if_just_battled
opentext opentext
writetext PokefanfGeorgiaAfterBattleText writetext PokefanfGeorgiaAfterBattleText
@@ -207,9 +207,9 @@ PokefanfGeorgiaScript:
end end
TrainerSupernerdShawn: 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 end_if_just_battled
opentext opentext
writetext SupernerdShawnAfterBattleText writetext SupernerdShawnAfterBattleText

16
maps/FastShipCabins_SW_SSW_NW.asm
View File

@@ -12,9 +12,9 @@ FastShipCabins_SW_SSW_NW_MapScriptHeader:
db 0 db 0
TrainerFirebreatherLyle: 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 end_if_just_battled
opentext opentext
writetext FirebreatherLyleAfterBattleText writetext FirebreatherLyleAfterBattleText
@@ -23,9 +23,9 @@ FirebreatherLyleScript:
end end
TrainerBug_catcherKen: 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 end_if_just_battled
opentext opentext
writetext Bug_catcherKenAfterBattleText writetext Bug_catcherKenAfterBattleText
@@ -34,9 +34,9 @@ Bug_catcherKenScript:
end end
TrainerBeautyCassie: 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 end_if_just_battled
opentext opentext
writetext BeautyCassieAfterBattleText writetext BeautyCassieAfterBattleText
@@ -45,9 +45,9 @@ BeautyCassieScript:
end end
TrainerGuitaristClyde: 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 end_if_just_battled
special Mobile_DummyReturnFalse special Mobile_DummyReturnFalse
iftrue .mobile iftrue .mobile

4
maps/GoldenrodDeptStoreElevator.asm
View File

@@ -62,8 +62,8 @@ GoldenrodDeptStoreElevator_MapEventHeader:
.Warps: .Warps:
db 2 db 2
warp_def $3, $1, 255, GOLDENROD_DEPT_STORE_1F warp_def $3, $1, -1, GOLDENROD_DEPT_STORE_1F
warp_def $3, $2, 255, GOLDENROD_DEPT_STORE_1F warp_def $3, $2, -1, GOLDENROD_DEPT_STORE_1F
.XYTriggers: .XYTriggers:
db 0 db 0

Some files were not shown because too many files have changed in this diff Show More