SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE

This commit is contained in:
Rangi 2020-07-17 13:01:48 -04:00
parent ef452ccbc7
commit 59d9932255
30 changed files with 219 additions and 219 deletions

View File

@ -219,7 +219,7 @@
const EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB
const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
const EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
const EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
const EVENT_TALKED_TO_SEAFOAM_GYM_GUIDE_ONCE
const EVENT_ENABLE_DIPLOMA_PRINTING
const EVENT_CINNABAR_ROCKS_CLEARED
const EVENT_CLEARED_NUGGET_BRIDGE
@ -1365,7 +1365,7 @@
const EVENT_VERMILION_FAN_CLUB_DOLL
const EVENT_BLUE_IN_CINNABAR
const EVENT_VIRIDIAN_GYM_BLUE
const EVENT_SEAFOAM_GYM_GYM_GUY
const EVENT_SEAFOAM_GYM_GYM_GUIDE
const EVENT_MT_MOON_SQUARE_ROCK
const EVENT_MT_MOON_SQUARE_CLEFAIRY
const EVENT_MT_MOON_RIVAL

View File

@ -73,7 +73,7 @@
const SPRITE_SLOWPOKE ; 45
const SPRITE_CAPTAIN ; 46
const SPRITE_BIG_LAPRAS ; 47
const SPRITE_GYM_GUY ; 48
const SPRITE_GYM_GUIDE ; 48
const SPRITE_SAILOR ; 49
const SPRITE_BIKER ; 4a
const SPRITE_PHARMACIST ; 4b

View File

@ -77,7 +77,7 @@ OverworldSprites:
overworld_sprite SlowpokeSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
overworld_sprite CaptainSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite BigLaprasSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
overworld_sprite GymGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite GymGuideSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite SailorSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite BikerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite PharmacistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

View File

@ -609,7 +609,7 @@ InitializeEventsScript:
setevent EVENT_TRAINERS_IN_CERULEAN_GYM
setevent EVENT_COPYCATS_HOUSE_2F_DOLL
setevent EVENT_VIRIDIAN_GYM_BLUE
setevent EVENT_SEAFOAM_GYM_GYM_GUY
setevent EVENT_SEAFOAM_GYM_GYM_GUIDE
setevent EVENT_MT_MOON_SQUARE_CLEFAIRY
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL

View File

@ -75,7 +75,7 @@ CalSpriteGFX:: INCBIN "gfx/sprites/cal.2bpp"
SlowpokeSpriteGFX:: INCBIN "gfx/sprites/slowpoke.2bpp"
CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp"
BigLaprasSpriteGFX:: INCBIN "gfx/sprites/big_lapras.2bpp"
GymGuySpriteGFX:: INCBIN "gfx/sprites/gym_guy.2bpp"
GymGuideSpriteGFX:: INCBIN "gfx/sprites/gym_guide.2bpp"
SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp"
BikerSpriteGFX:: INCBIN "gfx/sprites/biker.2bpp"
PharmacistSpriteGFX:: INCBIN "gfx/sprites/pharmacist.2bpp"

View File

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 295 B

View File

@ -5,7 +5,7 @@
const AZALEAGYM_BUG_CATCHER3
const AZALEAGYM_TWIN1
const AZALEAGYM_TWIN2
const AZALEAGYM_GYM_GUY
const AZALEAGYM_GYM_GUIDE
AzaleaGym_MapScripts:
db 0 ; scene scripts
@ -122,19 +122,19 @@ TrainerBugCatcherJosh:
closetext
end
AzaleaGymGuyScript:
AzaleaGymGuideScript:
faceplayer
checkevent EVENT_BEAT_BUGSY
iftrue .AzaleaGymGuyWinScript
iftrue .AzaleaGymGuideWinScript
opentext
writetext AzaleaGymGuyText
writetext AzaleaGymGuideText
waitbutton
closetext
end
.AzaleaGymGuyWinScript:
.AzaleaGymGuideWinScript:
opentext
writetext AzaleaGymGuyWinText
writetext AzaleaGymGuideWinText
waitbutton
closetext
end
@ -325,7 +325,7 @@ TwinsAmyandmay2AfterBattleText:
cont "a shame."
done
AzaleaGymGuyText:
AzaleaGymGuideText:
text "Yo, challenger!"
para "BUGSY's young, but"
@ -347,7 +347,7 @@ AzaleaGymGuyText:
cont "tive too."
done
AzaleaGymGuyWinText:
AzaleaGymGuideWinText:
text "Well done! That"
line "was a great clash"
@ -379,4 +379,4 @@ AzaleaGym_MapEvents:
object_event 0, 2, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1
object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuideScript, -1

View File

@ -3,7 +3,7 @@
const BLACKTHORNGYM1F_COOLTRAINER_M1
const BLACKTHORNGYM1F_COOLTRAINER_M2
const BLACKTHORNGYM1F_COOLTRAINER_F
const BLACKTHORNGYM1F_GYM_GUY
const BLACKTHORNGYM1F_GYM_GUIDE
BlackthornGym1F_MapScripts:
db 0 ; scene scripts
@ -123,18 +123,18 @@ TrainerCooltrainerfLola:
closetext
end
BlackthornGymGuyScript:
BlackthornGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_CLAIR
iftrue .BlackthornGymGuyWinScript
writetext BlackthornGymGuyText
iftrue .BlackthornGymGuideWinScript
writetext BlackthornGymGuideText
waitbutton
closetext
end
.BlackthornGymGuyWinScript:
writetext BlackthornGymGuyWinText
.BlackthornGymGuideWinScript:
writetext BlackthornGymGuideWinText
waitbutton
closetext
end
@ -346,7 +346,7 @@ CooltrainerfLolaAfterBattleText:
cont "type moves."
done
BlackthornGymGuyText:
BlackthornGymGuideText:
text "Yo! CHAMP in"
line "making!"
@ -371,7 +371,7 @@ BlackthornGymGuyText:
line "ice-type moves."
done
BlackthornGymGuyWinText:
BlackthornGymGuideWinText:
text "You were great to"
line "beat CLAIR!"
@ -407,4 +407,4 @@ BlackthornGym1F_MapEvents:
object_event 6, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermMike, -1
object_event 1, 14, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainermPaul, -1
object_event 9, 2, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainerfLola, -1
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuyScript, -1
object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BlackthornGymGuideScript, -1

View File

@ -6,7 +6,7 @@
const CELADONGAMECORNER_FISHING_GURU
const CELADONGAMECORNER_FISHER1
const CELADONGAMECORNER_FISHER2
const CELADONGAMECORNER_GYM_GUY
const CELADONGAMECORNER_GYM_GUIDE
const CELADONGAMECORNER_GRAMPS
CeladonGameCorner_MapScripts:
@ -90,8 +90,8 @@ CeladonGameCornerFisherScript:
turnobject LAST_TALKED, LEFT
end
CeladonGymGuyScript:
jumptextfaceplayer CeladonGymGuyText
CeladonGymGuideScript:
jumptextfaceplayer CeladonGymGuideText
CeladonGameCornerGrampsScript:
faceplayer
@ -255,7 +255,7 @@ else
done
endc
CeladonGymGuyText:
CeladonGymGuideText:
text "Hey! CHAMP in"
line "making!"
@ -378,5 +378,5 @@ CeladonGameCorner_MapEvents:
object_event 11, 7, SPRITE_FISHING_GURU, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFishingGuruScript, -1
object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, DAY, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
object_event 8, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, NITE, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerFisherScript, -1
object_event 11, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuyScript, -1
object_event 11, 3, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonGymGuideScript, -1
object_event 2, 8, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonGameCornerGrampsScript, -1

View File

@ -1,6 +1,6 @@
object_const_def ; object_event constants
const CELADONMANSION3F_COOLTRAINER_M
const CELADONMANSION3F_GYM_GUY
const CELADONMANSION3F_GYM_GUIDE
const CELADONMANSION3F_SUPER_NERD
const CELADONMANSION3F_FISHER
@ -207,6 +207,6 @@ CeladonMansion3F_MapEvents:
db 4 ; object events
object_event 3, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GameFreakGameDesignerScript, -1
object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakGraphicArtistScript, -1
object_event 3, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakGraphicArtistScript, -1
object_event 0, 7, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GameFreakProgrammerScript, -1
object_event 0, 4, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GameFreakCharacterDesignerScript, -1

View File

@ -4,7 +4,7 @@
const CERULEANGYM_SWIMMER_GIRL1
const CERULEANGYM_SWIMMER_GIRL2
const CERULEANGYM_SWIMMER_GUY
const CERULEANGYM_GYM_GUY
const CERULEANGYM_GYM_GUIDE
CeruleanGym_MapScripts:
db 2 ; scene scripts
@ -116,18 +116,18 @@ TrainerSwimmermParker:
closetext
end
CeruleanGymGuyScript:
CeruleanGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_MISTY
iftrue .CeruleanGymGuyWinScript
writetext CeruleanGymGuyText
iftrue .CeruleanGymGuideWinScript
writetext CeruleanGymGuideText
waitbutton
closetext
end
.CeruleanGymGuyWinScript:
writetext CeruleanGymGuyWinText
.CeruleanGymGuideWinScript:
writetext CeruleanGymGuideWinText
waitbutton
closetext
end
@ -340,7 +340,7 @@ SwimmermParkerAfterBattleText:
cont "you'll be crushed!"
done
CeruleanGymGuyText:
CeruleanGymGuideText:
text "Yo! CHAMP in"
line "making!"
@ -351,7 +351,7 @@ CeruleanGymGuyText:
line "He-he-he."
done
CeruleanGymGuyWinText:
CeruleanGymGuideWinText:
text "Hoo, you showed me"
line "how tough you are."
@ -380,4 +380,4 @@ CeruleanGym_MapEvents:
object_event 4, 6, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 1, 9, SPRITE_SWIMMER_GIRL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 8, 9, SPRITE_SWIMMER_GUY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM
object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanGymGuideScript, EVENT_TRAINERS_IN_CERULEAN_GYM

View File

@ -1,7 +1,7 @@
object_const_def ; object_event constants
const CERULEANPOKECENTER1F_NURSE
const CERULEANPOKECENTER1F_SUPER_NERD
const CERULEANPOKECENTER1F_GYM_GUY
const CERULEANPOKECENTER1F_GYM_GUIDE
CeruleanPokecenter1F_MapScripts:
db 0 ; scene scripts
@ -19,8 +19,8 @@ CeruleanPokecenter1FSuperNerdScript:
.mobile
jumptextfaceplayer CeruleanPokecenter1FSuperNerdText_Mobile
CeruleanPokecenter1FGymGuyScript:
jumptextfaceplayer CeruleanPokecenter1FGymGuyText
CeruleanPokecenter1FGymGuideScript:
jumptextfaceplayer CeruleanPokecenter1FGymGuideText
CeruleanPokecenter1FSuperNerdText:
text "For battles, I'd"
@ -46,7 +46,7 @@ CeruleanPokecenter1FSuperNerdText_Mobile:
cont "nerve wracking."
done
CeruleanPokecenter1FGymGuyText:
CeruleanPokecenter1FGymGuideText:
text "The MAGNET TRAIN"
line "travels at over"
@ -75,4 +75,4 @@ CeruleanPokecenter1F_MapEvents:
db 3 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FNurseScript, -1
object_event 8, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FSuperNerdScript, -1
object_event 1, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuyScript, -1
object_event 1, 5, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanPokecenter1FGymGuideScript, -1

View File

@ -1,7 +1,7 @@
object_const_def ; object_event constants
const CIANWOODPOKECENTER1F_NURSE
const CIANWOODPOKECENTER1F_LASS
const CIANWOODPOKECENTER1F_GYM_GUY
const CIANWOODPOKECENTER1F_GYM_GUIDE
const CIANWOODPOKECENTER1F_SUPER_NERD
CianwoodPokecenter1F_MapScripts:
@ -15,19 +15,19 @@ CianwoodPokecenter1FNurseScript:
CianwoodPokecenter1FLassScript:
jumptextfaceplayer CianwoodPokecenter1FLassText
CianwoodGymGuyScript:
CianwoodGymGuideScript:
faceplayer
checkevent EVENT_BEAT_CHUCK
iftrue .CianwoodGymGuyWinScript
iftrue .CianwoodGymGuideWinScript
opentext
writetext CianwoodGymGuyText
writetext CianwoodGymGuideText
waitbutton
closetext
end
.CianwoodGymGuyWinScript:
.CianwoodGymGuideWinScript:
opentext
writetext CianwoodGymGuyWinText
writetext CianwoodGymGuideWinText
waitbutton
closetext
end
@ -44,7 +44,7 @@ CianwoodPokecenter1FLassText:
cont "rare #MON."
done
CianwoodGymGuyText:
CianwoodGymGuideText:
text "The #MON GYM"
line "trainers here are"
cont "macho bullies."
@ -83,7 +83,7 @@ CianwoodGymGuyText:
line "go outside."
done
CianwoodGymGuyWinText:
CianwoodGymGuideWinText:
text "<PLAYER>! You won!"
line "I could tell by"
cont "looking at you!"
@ -146,5 +146,5 @@ CianwoodPokecenter1F_MapEvents:
db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FNurseScript, -1
object_event 1, 5, SPRITE_LASS, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FLassScript, -1
object_event 5, 3, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuyScript, -1
object_event 5, 3, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CianwoodGymGuideScript, -1
object_event 8, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CianwoodPokecenter1FSuperNerdScript, -1

View File

@ -4,7 +4,7 @@
const ECRUTEAKGYM_SAGE2
const ECRUTEAKGYM_GRANNY1
const ECRUTEAKGYM_GRANNY2
const ECRUTEAKGYM_GYM_GUY
const ECRUTEAKGYM_GYM_GUIDE
const ECRUTEAKGYM_GRAMPS
EcruteakGym_MapScripts:
@ -139,18 +139,18 @@ TrainerMediumGrace:
closetext
end
EcruteakGymGuyScript:
EcruteakGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_MORTY
iftrue .EcruteakGymGuyWinScript
writetext EcruteakGymGuyText
iftrue .EcruteakGymGuideWinScript
writetext EcruteakGymGuideText
waitbutton
closetext
end
.EcruteakGymGuyWinScript:
writetext EcruteakGymGuyWinText
.EcruteakGymGuideWinScript:
writetext EcruteakGymGuideWinText
waitbutton
closetext
end
@ -353,7 +353,7 @@ MediumGraceAfterBattleText:
line "before our eyes!"
done
EcruteakGymGuyText:
EcruteakGymGuideText:
text "The trainers here"
line "have secret mo-"
cont "tives."
@ -365,7 +365,7 @@ EcruteakGymGuyText:
line "ECRUTEAK."
done
EcruteakGymGuyWinText:
EcruteakGymGuideWinText:
text "Whew, <PLAYER>."
line "You did great!"
@ -434,5 +434,5 @@ EcruteakGym_MapEvents:
object_event 3, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSagePing, -1
object_event 7, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumMartha, -1
object_event 7, 9, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 1, TrainerMediumGrace, -1
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuyScript, -1
object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakGymGuideScript, -1
object_event 4, 14, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS

View File

@ -2,7 +2,7 @@
const ECRUTEAKPOKECENTER1F_NURSE
const ECRUTEAKPOKECENTER1F_POKEFAN_M
const ECRUTEAKPOKECENTER1F_COOLTRAINER_F
const ECRUTEAKPOKECENTER1F_GYM_GUY
const ECRUTEAKPOKECENTER1F_GYM_GUIDE
const ECRUTEAKPOKECENTER1F_BILL
EcruteakPokecenter1F_MapScripts:
@ -69,8 +69,8 @@ EcruteakPokecenter1FPokefanMScript:
EcruteakPokecenter1FCooltrainerFScript:
jumptextfaceplayer EcruteakPokecenter1FCooltrainerFText
EcruteakPokecenter1FGymGuyScript:
jumptextfaceplayer EcruteakPokecenter1FGymGuyText
EcruteakPokecenter1FGymGuideScript:
jumptextfaceplayer EcruteakPokecenter1FGymGuideText
EcruteakPokecenter1FBillMovement1:
step UP
@ -194,7 +194,7 @@ EcruteakPokecenter1FCooltrainerFText:
line "really tough too."
done
EcruteakPokecenter1FGymGuyText:
EcruteakPokecenter1FGymGuideText:
text "LAKE OF RAGE…"
para "The appearance of"
@ -220,5 +220,5 @@ EcruteakPokecenter1F_MapEvents:
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FPokefanMScript, -1
object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FCooltrainerFScript, -1
object_event 7, 1, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuyScript, -1
object_event 7, 1, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakPokecenter1FGymGuideScript, -1
object_event 0, 7, SPRITE_BILL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL

View File

@ -4,7 +4,7 @@
const FUCHSIAGYM_FUCHSIA_GYM_2
const FUCHSIAGYM_FUCHSIA_GYM_3
const FUCHSIAGYM_FUCHSIA_GYM_4
const FUCHSIAGYM_GYM_GUY
const FUCHSIAGYM_GYM_GUIDE
FuchsiaGym_MapScripts:
db 0 ; scene scripts
@ -193,18 +193,18 @@ CamperBarryScript:
closetext
end
FuchsiaGymGuyScript:
FuchsiaGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_JANINE
iftrue .FuchsiaGymGuyWinScript
writetext FuchsiaGymGuyText
iftrue .FuchsiaGymGuideWinScript
writetext FuchsiaGymGuideText
waitbutton
closetext
end
.FuchsiaGymGuyWinScript:
writetext FuchsiaGymGuyWinText
.FuchsiaGymGuideWinScript:
writetext FuchsiaGymGuideWinText
waitbutton
closetext
end
@ -357,7 +357,7 @@ CamperBarryAfterText:
cont "what, huh?"
done
FuchsiaGymGuyText:
FuchsiaGymGuideText:
text "Yo, CHAMP in"
line "making!"
@ -372,7 +372,7 @@ FuchsiaGymGuyText:
line "the real JANINE?"
done
FuchsiaGymGuyWinText:
FuchsiaGymGuideWinText:
text "That was a great"
line "battle, trainer"
cont "from JOHTO!"
@ -397,4 +397,4 @@ FuchsiaGym_MapEvents:
object_event 5, 11, SPRITE_FUCHSIA_GYM_2, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, LassLindaScript, -1
object_event 9, 4, SPRITE_FUCHSIA_GYM_3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PicnickerCindyScript, -1
object_event 4, 2, SPRITE_FUCHSIA_GYM_4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CamperBarryScript, -1
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuyScript, -1
object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FuchsiaGymGuideScript, -1

View File

@ -4,7 +4,7 @@
const GOLDENRODGYM_LASS2
const GOLDENRODGYM_BEAUTY1
const GOLDENRODGYM_BEAUTY2
const GOLDENRODGYM_GYM_GUY
const GOLDENRODGYM_GYM_GUIDE
GoldenrodGym_MapScripts:
db 2 ; scene scripts
@ -147,19 +147,19 @@ TrainerBeautySamantha:
closetext
end
GoldenrodGymGuyScript:
GoldenrodGymGuideScript:
faceplayer
checkevent EVENT_BEAT_WHITNEY
iftrue .GoldenrodGymGuyWinScript
iftrue .GoldenrodGymGuideWinScript
opentext
writetext GoldenrodGymGuyText
writetext GoldenrodGymGuideText
waitbutton
closetext
end
.GoldenrodGymGuyWinScript:
.GoldenrodGymGuideWinScript:
opentext
writetext GoldenrodGymGuyWinText
writetext GoldenrodGymGuideWinText
waitbutton
closetext
end
@ -358,7 +358,7 @@ BeautySamanthaAfterBattleText:
cont "on any type…"
done
GoldenrodGymGuyText:
GoldenrodGymGuideText:
text "Yo! CHAMP in"
line "making!"
@ -371,7 +371,7 @@ GoldenrodGymGuyText:
cont "#MON."
done
GoldenrodGymGuyWinText:
GoldenrodGymGuideWinText:
text "You won? Great! I"
line "was busy admiring"
cont "the ladies here."
@ -397,4 +397,4 @@ GoldenrodGym_MapEvents:
object_event 9, 6, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1
object_event 0, 2, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
object_event 19, 5, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1
object_event 5, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1
object_event 5, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuideScript, -1

View File

@ -5,7 +5,7 @@
const MAHOGANYGYM_BEAUTY2
const MAHOGANYGYM_ROCKER2
const MAHOGANYGYM_ROCKER3
const MAHOGANYGYM_GYM_GUY
const MAHOGANYGYM_GYM_GUIDE
MahoganyGym_MapScripts:
db 0 ; scene scripts
@ -123,18 +123,18 @@ TrainerBoarderDouglas:
closetext
end
MahoganyGymGuyScript:
MahoganyGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_PRYCE
iftrue .MahoganyGymGuyWinScript
writetext MahoganyGymGuyText
iftrue .MahoganyGymGuideWinScript
writetext MahoganyGymGuideText
waitbutton
closetext
end
.MahoganyGymGuyWinScript:
writetext MahoganyGymGuyWinText
.MahoganyGymGuideWinScript:
writetext MahoganyGymGuideWinText
waitbutton
closetext
end
@ -338,7 +338,7 @@ SkierClarissaAfterBattleText:
cont "about my skiing…"
done
MahoganyGymGuyText:
MahoganyGymGuideText:
text "PRYCE is a veteran"
line "who has trained"
@ -358,7 +358,7 @@ MahoganyGymGuyText:
line "ambition!"
done
MahoganyGymGuyWinText:
MahoganyGymGuideWinText:
text "PRYCE is some-"
line "thing, but you're"
cont "something else!"
@ -390,4 +390,4 @@ MahoganyGym_MapEvents:
object_event 9, 17, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerSkierClarissa, -1
object_event 5, 9, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderBrad, -1
object_event 2, 4, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBoarderDouglas, -1
object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuyScript, -1
object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MahoganyGymGuideScript, -1

View File

@ -1,6 +1,6 @@
object_const_def ; object_event constants
const OLIVINEGYM_JASMINE
const OLIVINEGYM_GYM_GUY
const OLIVINEGYM_GYM_GUIDE
OlivineGym_MapScripts:
db 0 ; scene scripts
@ -58,28 +58,28 @@ OlivineGymActivateRockets:
.RadioTowerRockets:
jumpstd RadioTowerRocketsScript
OlivineGymGuyScript:
OlivineGymGuideScript:
faceplayer
checkevent EVENT_BEAT_JASMINE
iftrue .OlivineGymGuyWinScript
iftrue .OlivineGymGuideWinScript
checkevent EVENT_JASMINE_RETURNED_TO_GYM
iffalse .OlivineGymGuyPreScript
iffalse .OlivineGymGuidePreScript
opentext
writetext OlivineGymGuyText
writetext OlivineGymGuideText
waitbutton
closetext
end
.OlivineGymGuyWinScript:
.OlivineGymGuideWinScript:
opentext
writetext OlivineGymGuyWinText
writetext OlivineGymGuideWinText
waitbutton
closetext
end
.OlivineGymGuyPreScript:
.OlivineGymGuidePreScript:
opentext
writetext OlivineGymGuyPreText
writetext OlivineGymGuidePreText
waitbutton
closetext
end
@ -162,7 +162,7 @@ Jasmine_GoodLuck:
cont "but good luck…"
done
OlivineGymGuyText:
OlivineGymGuideText:
text "JASMINE uses the"
line "newly discovered"
cont "steel-type."
@ -171,7 +171,7 @@ OlivineGymGuyText:
line "much about it."
done
OlivineGymGuyWinText:
OlivineGymGuideWinText:
text "That was awesome."
para "The steel-type,"
@ -182,7 +182,7 @@ OlivineGymGuyWinText:
cont "unknown kind!"
done
OlivineGymGuyPreText:
OlivineGymGuidePreText:
text "JASMINE, the GYM"
line "LEADER, is at the"
cont "LIGHTHOUSE."
@ -210,4 +210,4 @@ OlivineGym_MapEvents:
db 2 ; object events
object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE
object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuyScript, -1
object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuideScript, -1

View File

@ -1,7 +1,7 @@
object_const_def ; object_event constants
const PEWTERGYM_BROCK
const PEWTERGYM_YOUNGSTER
const PEWTERGYM_GYM_GUY
const PEWTERGYM_GYM_GUIDE
PewterGym_MapScripts:
db 0 ; scene scripts
@ -49,18 +49,18 @@ TrainerCamperJerry:
closetext
end
PewterGymGuyScript:
PewterGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_BROCK
iftrue .PewterGymGuyWinScript
writetext PewterGymGuyText
iftrue .PewterGymGuideWinScript
writetext PewterGymGuideText
waitbutton
closetext
end
.PewterGymGuyWinScript:
writetext PewterGymGuyWinText
.PewterGymGuideWinScript:
writetext PewterGymGuideWinText
waitbutton
closetext
end
@ -175,7 +175,7 @@ CamperJerryAfterBattleText:
line "seriously."
done
PewterGymGuyText:
PewterGymGuideText:
text "Yo! CHAMP in"
line "making! You're"
@ -192,7 +192,7 @@ PewterGymGuyText:
line "GYM LEADERS."
done
PewterGymGuyWinText:
PewterGymGuideWinText:
text "Yo! CHAMP in"
line "making! That GYM"
@ -222,4 +222,4 @@ PewterGym_MapEvents:
db 3 ; object events
object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PewterGymBrockScript, -1
object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1
object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1
object_event 6, 11, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuideScript, -1

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