ref: 59d9932255aa01e54dedfd82e9eb6343e9fe7883
parent: ef452ccbc7e448a490d1d081c63088cce7b73b0b
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jul 17 09:01:48 EDT 2020
SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -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
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -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
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -77,7 +77,7 @@
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
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -609,7 +609,7 @@
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
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -75,7 +75,7 @@
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"
binary files /dev/null b/gfx/sprites/gym_guide.png differ
binary files a/gfx/sprites/gym_guy.png /dev/null differ
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -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 @@
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 @@
cont "a shame."
done
-AzaleaGymGuyText:
+AzaleaGymGuideText:
text "Yo, challenger!"
para "BUGSY's young, but"
@@ -347,7 +347,7 @@
cont "tive too."
done
-AzaleaGymGuyWinText:
+AzaleaGymGuideWinText:
text "Well done! That"
line "was a great clash"
@@ -379,4 +379,4 @@
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
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -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 @@
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 @@
cont "type moves."
done
-BlackthornGymGuyText:
+BlackthornGymGuideText:
text "Yo! CHAMP in"
line "making!"
@@ -371,7 +371,7 @@
line "ice-type moves."
done
-BlackthornGymGuyWinText:
+BlackthornGymGuideWinText:
text "You were great to"
line "beat CLAIR!"
@@ -407,4 +407,4 @@
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
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -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 @@
turnobject LAST_TALKED, LEFT
end
-CeladonGymGuyScript:
- jumptextfaceplayer CeladonGymGuyText
+CeladonGymGuideScript:
+ jumptextfaceplayer CeladonGymGuideText
CeladonGameCornerGrampsScript:
faceplayer
@@ -255,7 +255,7 @@
done
endc
-CeladonGymGuyText:
+CeladonGymGuideText:
text "Hey! CHAMP in"
line "making!"
@@ -378,5 +378,5 @@
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
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -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 @@
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
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -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 @@
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 @@
cont "you'll be crushed!"
done
-CeruleanGymGuyText:
+CeruleanGymGuideText:
text "Yo! CHAMP in"
line "making!"
@@ -351,7 +351,7 @@
line "He-he-he."
done
-CeruleanGymGuyWinText:
+CeruleanGymGuideWinText:
text "Hoo, you showed me"
line "how tough you are."
@@ -380,4 +380,4 @@
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
--- a/maps/CeruleanPokecenter1F.asm
+++ b/maps/CeruleanPokecenter1F.asm
@@ -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 @@
.mobile
jumptextfaceplayer CeruleanPokecenter1FSuperNerdText_Mobile
-CeruleanPokecenter1FGymGuyScript:
- jumptextfaceplayer CeruleanPokecenter1FGymGuyText
+CeruleanPokecenter1FGymGuideScript:
+ jumptextfaceplayer CeruleanPokecenter1FGymGuideText
CeruleanPokecenter1FSuperNerdText:
text "For battles, I'd"
@@ -46,7 +46,7 @@
cont "nerve wracking."
done
-CeruleanPokecenter1FGymGuyText:
+CeruleanPokecenter1FGymGuideText:
text "The MAGNET TRAIN"
line "travels at over"
@@ -75,4 +75,4 @@
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
--- a/maps/CianwoodPokecenter1F.asm
+++ b/maps/CianwoodPokecenter1F.asm
@@ -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 @@
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 @@
cont "rare #MON."
done
-CianwoodGymGuyText:
+CianwoodGymGuideText:
text "The #MON GYM"
line "trainers here are"
cont "macho bullies."
@@ -83,7 +83,7 @@
line "go outside."
done
-CianwoodGymGuyWinText:
+CianwoodGymGuideWinText:
text "<PLAYER>! You won!"
line "I could tell by"
cont "looking at you!"
@@ -146,5 +146,5 @@
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
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -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 @@
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 @@
line "before our eyes!"
done
-EcruteakGymGuyText:
+EcruteakGymGuideText:
text "The trainers here"
line "have secret mo-"
cont "tives."
@@ -365,7 +365,7 @@
line "ECRUTEAK."
done
-EcruteakGymGuyWinText:
+EcruteakGymGuideWinText:
text "Whew, <PLAYER>."
line "You did great!"
@@ -434,5 +434,5 @@
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
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -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 @@
EcruteakPokecenter1FCooltrainerFScript:
jumptextfaceplayer EcruteakPokecenter1FCooltrainerFText
-EcruteakPokecenter1FGymGuyScript:
- jumptextfaceplayer EcruteakPokecenter1FGymGuyText
+EcruteakPokecenter1FGymGuideScript:
+ jumptextfaceplayer EcruteakPokecenter1FGymGuideText
EcruteakPokecenter1FBillMovement1:
step UP
@@ -194,7 +194,7 @@
line "really tough too."
done
-EcruteakPokecenter1FGymGuyText:
+EcruteakPokecenter1FGymGuideText:
text "LAKE OF RAGE…"
para "The appearance of"
@@ -220,5 +220,5 @@
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
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -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 @@
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 @@
cont "what, huh?"
done
-FuchsiaGymGuyText:
+FuchsiaGymGuideText:
text "Yo, CHAMP in"
line "making!"
@@ -372,7 +372,7 @@
line "the real JANINE?"
done
-FuchsiaGymGuyWinText:
+FuchsiaGymGuideWinText:
text "That was a great"
line "battle, trainer"
cont "from JOHTO!"
@@ -397,4 +397,4 @@
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
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -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 @@
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 @@
cont "on any type…"
done
-GoldenrodGymGuyText:
+GoldenrodGymGuideText:
text "Yo! CHAMP in"
line "making!"
@@ -371,7 +371,7 @@
cont "#MON."
done
-GoldenrodGymGuyWinText:
+GoldenrodGymGuideWinText:
text "You won? Great! I"
line "was busy admiring"
cont "the ladies here."
@@ -397,4 +397,4 @@
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
--- a/maps/MahoganyGym.asm
+++ b/maps/MahoganyGym.asm
@@ -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 @@
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 @@
cont "about my skiing…"
done
-MahoganyGymGuyText:
+MahoganyGymGuideText:
text "PRYCE is a veteran"
line "who has trained"
@@ -358,7 +358,7 @@
line "ambition!"
done
-MahoganyGymGuyWinText:
+MahoganyGymGuideWinText:
text "PRYCE is some-"
line "thing, but you're"
cont "something else!"
@@ -390,4 +390,4 @@
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
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -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 @@
.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 @@
cont "but good luck…"
done
-OlivineGymGuyText:
+OlivineGymGuideText:
text "JASMINE uses the"
line "newly discovered"
cont "steel-type."
@@ -171,7 +171,7 @@
line "much about it."
done
-OlivineGymGuyWinText:
+OlivineGymGuideWinText:
text "That was awesome."
para "The steel-type,"
@@ -182,7 +182,7 @@
cont "unknown kind!"
done
-OlivineGymGuyPreText:
+OlivineGymGuidePreText:
text "JASMINE, the GYM"
line "LEADER, is at the"
cont "LIGHTHOUSE."
@@ -210,4 +210,4 @@
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
--- a/maps/PewterGym.asm
+++ b/maps/PewterGym.asm
@@ -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 @@
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 @@
line "seriously."
done
-PewterGymGuyText:
+PewterGymGuideText:
text "Yo! CHAMP in"
line "making! You're"
@@ -192,7 +192,7 @@
line "GYM LEADERS."
done
-PewterGymGuyWinText:
+PewterGymGuideWinText:
text "Yo! CHAMP in"
line "making! That GYM"
@@ -222,4 +222,4 @@
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
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -1,9 +1,9 @@
object_const_def ; object_event constants
const POWERPLANT_OFFICER1
- const POWERPLANT_GYM_GUY1
- const POWERPLANT_GYM_GUY2
+ const POWERPLANT_GYM_GUIDE1
+ const POWERPLANT_GYM_GUIDE2
const POWERPLANT_OFFICER2
- const POWERPLANT_GYM_GUY3
+ const POWERPLANT_GYM_GUIDE3
const POWERPLANT_MANAGER
const POWERPLANT_FOREST
@@ -25,9 +25,9 @@
showemote EMOTE_SHOCK, POWERPLANT_OFFICER1, 15
waitsfx
pause 30
- applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ApproachGymGuy2Movement
- turnobject POWERPLANT_GYM_GUY1, DOWN
- turnobject POWERPLANT_GYM_GUY2, DOWN
+ applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ApproachGymGuide2Movement
+ turnobject POWERPLANT_GYM_GUIDE1, DOWN
+ turnobject POWERPLANT_GYM_GUIDE2, DOWN
opentext
writetext PowerPlantOfficer1CeruleanShadyCharacterText
waitbutton
@@ -67,34 +67,34 @@
closetext
end
-PowerPlantGymGuy1Script:
+PowerPlantGymGuide1Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext PowerPlantGymGuy1SomeoneStoleAPartText
+ writetext PowerPlantGymGuide1SomeoneStoleAPartText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext PowerPlantGymGuy1GeneratorUpAndRunningText
+ writetext PowerPlantGymGuide1GeneratorUpAndRunningText
waitbutton
closetext
end
-PowerPlantGymGuy2Script:
+PowerPlantGymGuide2Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext PowerPlantGymGuy2PowerPlantUpAndRunningText
+ writetext PowerPlantGymGuide2PowerPlantUpAndRunningText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext PowerPlantGymGuy2GeneratorIsRunningAgainText
+ writetext PowerPlantGymGuide2GeneratorIsRunningAgainText
waitbutton
closetext
end
@@ -115,18 +115,18 @@
closetext
end
-PowerPlantGymGuy4Script:
+PowerPlantGymGuide4Script:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext PowerPlantGymGuy4MagnetTrainConsumesElectricityText
+ writetext PowerPlantGymGuide4MagnetTrainConsumesElectricityText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext PowerPlantGymGuy4WeCanGetMagnetTrainRunningText
+ writetext PowerPlantGymGuide4WeCanGetMagnetTrainRunningText
waitbutton
closetext
end
@@ -197,7 +197,7 @@
PowerPlantBookshelf:
jumpstd DifficultBookshelfScript
-PowerPlantOfficer1ApproachGymGuy2Movement:
+PowerPlantOfficer1ApproachGymGuide2Movement:
step RIGHT
step RIGHT
step UP
@@ -242,7 +242,7 @@
cont "presence."
done
-PowerPlantGymGuy1SomeoneStoleAPartText:
+PowerPlantGymGuide1SomeoneStoleAPartText:
text "Someone made off"
line "with a part that's"
@@ -254,7 +254,7 @@
cont "useless!"
done
-PowerPlantGymGuy1GeneratorUpAndRunningText:
+PowerPlantGymGuide1GeneratorUpAndRunningText:
text "The generator's up"
line "and running. It's"
@@ -262,7 +262,7 @@
line "to spare."
done
-PowerPlantGymGuy2PowerPlantUpAndRunningText:
+PowerPlantGymGuide2PowerPlantUpAndRunningText:
text "This POWER PLANT"
line "had been abandoned"
cont "in the past."
@@ -274,7 +274,7 @@
line "the MAGNET TRAIN."
done
-PowerPlantGymGuy2GeneratorIsRunningAgainText:
+PowerPlantGymGuide2GeneratorIsRunningAgainText:
text "The generator's"
line "running again!"
done
@@ -299,7 +299,7 @@
line "been cheerful."
done
-PowerPlantGymGuy4MagnetTrainConsumesElectricityText:
+PowerPlantGymGuide4MagnetTrainConsumesElectricityText:
text "The MAGNET TRAIN"
line "consumes a lot of"
cont "electricity."
@@ -309,7 +309,7 @@
cont "isn't operating."
done
-PowerPlantGymGuy4WeCanGetMagnetTrainRunningText:
+PowerPlantGymGuide4WeCanGetMagnetTrainRunningText:
text "All right! We can"
line "finally get the"
@@ -402,9 +402,9 @@
db 7 ; object events
object_event 4, 14, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficerScript, -1
- object_event 2, 9, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy1Script, -1
- object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy2Script, -1
+ object_event 2, 9, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuide1Script, -1
+ object_event 6, 11, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuide2Script, -1
object_event 9, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PowerPlantOfficer2Script, -1
- object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuy4Script, -1
+ object_event 7, 2, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PowerPlantGymGuide4Script, -1
object_event 14, 10, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PowerPlantManager, -1
- object_event 5, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
+ object_event 5, 5, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Forest, -1
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -1,6 +1,6 @@
object_const_def ; object_event constants
const RADIOTOWER3F_SUPER_NERD
- const RADIOTOWER3F_GYM_GUY
+ const RADIOTOWER3F_GYM_GUIDE
const RADIOTOWER3F_COOLTRAINER_F
const RADIOTOWER3F_ROCKET1
const RADIOTOWER3F_ROCKET2
@@ -26,18 +26,18 @@
RadioTower3FSuperNerdScript:
jumptextfaceplayer RadioTower3FSuperNerdText
-RadioTower3FGymGuyScript:
+RadioTower3FGymGuideScript:
faceplayer
opentext
checkevent EVENT_CLEARED_RADIO_TOWER
iftrue .NoRockets
- writetext RadioTower3FGymGuyText_Rockets
+ writetext RadioTower3FGymGuideText_Rockets
waitbutton
closetext
end
.NoRockets:
- writetext RadioTower3FGymGuyText
+ writetext RadioTower3FGymGuideText
waitbutton
closetext
end
@@ -165,7 +165,7 @@
line "200 kinds."
done
-RadioTower3FGymGuyText_Rockets:
+RadioTower3FGymGuideText_Rockets:
text "To trainers, #-"
line "MON are their"
cont "beloved partners."
@@ -177,7 +177,7 @@
line "#MON."
done
-RadioTower3FGymGuyText:
+RadioTower3FGymGuideText:
text "We run 24 hours a"
line "day to broadcast"
@@ -343,7 +343,7 @@
db 7 ; object events
object_event 7, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RadioTower3FSuperNerdScript, EVENT_RADIO_TOWER_CIVILIANS_AFTER
- object_event 3, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuyScript, -1
+ object_event 3, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RadioTower3FGymGuideScript, -1
object_event 11, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, RadioTower3FCooltrainerFScript, -1
object_event 5, 1, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 6, 2, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
--- a/maps/Route10Pokecenter1F.asm
+++ b/maps/Route10Pokecenter1F.asm
@@ -1,7 +1,7 @@
object_const_def ; object_event constants
const ROUTE10POKECENTER1F_NURSE
const ROUTE10POKECENTER1F_GENTLEMAN
- const ROUTE10POKECENTER1F_GYM_GUY
+ const ROUTE10POKECENTER1F_GYM_GUIDE
const ROUTE10POKECENTER1F_COOLTRAINER_F
Route10Pokecenter1F_MapScripts:
@@ -15,18 +15,18 @@
Route10Pokecenter1FGentlemanScript:
jumptextfaceplayer Route10Pokecenter1FGentlemanText
-Route10Pokecenter1FGymGuyScript:
+Route10Pokecenter1FGymGuideScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext Route10Pokecenter1FGymGuyText
+ writetext Route10Pokecenter1FGymGuideText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext Route10Pokecenter1FGymGuyText_ReturnedMachinePart
+ writetext Route10Pokecenter1FGymGuideText_ReturnedMachinePart
waitbutton
closetext
end
@@ -42,7 +42,7 @@
line "convenient."
done
-Route10Pokecenter1FGymGuyText:
+Route10Pokecenter1FGymGuideText:
text "The POWER PLANT's"
line "MANAGER is looking"
@@ -56,7 +56,7 @@
line "was stolen."
done
-Route10Pokecenter1FGymGuyText_ReturnedMachinePart:
+Route10Pokecenter1FGymGuideText_ReturnedMachinePart:
text "I hear TEAM ROCKET"
line "got back together"
@@ -93,5 +93,5 @@
db 4 ; object events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGentlemanScript, -1
- object_event 7, 2, SPRITE_GYM_GUY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuyScript, -1
+ object_event 7, 2, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FGymGuideScript, -1
object_event 1, 3, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route10Pokecenter1FCooltrainerFScript, -1
--- a/maps/SaffronGym.asm
+++ b/maps/SaffronGym.asm
@@ -4,7 +4,7 @@
const SAFFRONGYM_YOUNGSTER1
const SAFFRONGYM_GRANNY2
const SAFFRONGYM_YOUNGSTER2
- const SAFFRONGYM_GYM_GUY
+ const SAFFRONGYM_GYM_GUIDE
SaffronGym_MapScripts:
db 0 ; scene scripts
@@ -88,18 +88,18 @@
closetext
end
-SaffronGymGuyScript:
+SaffronGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_SABRINA
- iftrue .SaffronGymGuyWinScript
- writetext SaffronGymGuyText
+ iftrue .SaffronGymGuideWinScript
+ writetext SaffronGymGuideText
waitbutton
closetext
end
-.SaffronGymGuyWinScript:
- writetext SaffronGymGuyWinText
+.SaffronGymGuideWinScript:
+ writetext SaffronGymGuideWinText
waitbutton
closetext
end
@@ -264,7 +264,7 @@
cont "SABRINA."
done
-SaffronGymGuyText:
+SaffronGymGuideText:
text "Yo, CHAMP in"
line "making!"
@@ -283,7 +283,7 @@
para "Good luck!"
done
-SaffronGymGuyWinText:
+SaffronGymGuideWinText:
text "That was another"
line "fantastic battle!"
done
@@ -336,4 +336,4 @@
object_event 3, 16, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1
object_event 3, 4, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1
object_event 17, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1
- object_event 9, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1
+ object_event 9, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuideScript, -1
--- a/maps/SaffronMagnetTrainStation.asm
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,6 +1,6 @@
object_const_def ; object_event constants
const SAFFRONMAGNETTRAINSTATION_OFFICER
- const SAFFRONMAGNETTRAINSTATION_GYM_GUY
+ const SAFFRONMAGNETTRAINSTATION_GYM_GUIDE
const SAFFRONMAGNETTRAINSTATION_TEACHER
const SAFFRONMAGNETTRAINSTATION_LASS
@@ -68,18 +68,18 @@
closetext
end
-SaffronMagnetTrainStationGymGuyScript:
+SaffronMagnetTrainStationGymGuideScript:
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .ReturnedMachinePart
- writetext SaffronMagnetTrainStationGymGuyText
+ writetext SaffronMagnetTrainStationGymGuideText
waitbutton
closetext
end
.ReturnedMachinePart:
- writetext SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart
+ writetext SaffronMagnetTrainStationGymGuideText_ReturnedMachinePart
waitbutton
closetext
end
@@ -164,7 +164,7 @@
line "again."
done
-SaffronMagnetTrainStationGymGuyText:
+SaffronMagnetTrainStationGymGuideText:
text "The MAGNET TRAIN"
line "is a super-modern"
@@ -180,7 +180,7 @@
cont "tricity…"
done
-SaffronMagnetTrainStationGymGuyText_ReturnedMachinePart:
+SaffronMagnetTrainStationGymGuideText_ReturnedMachinePart:
text "Whew…"
para "How many times"
@@ -229,6 +229,6 @@
db 4 ; object events
object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationOfficerScript, -1
- object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuyScript, -1
+ object_event 10, 14, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationGymGuideScript, -1
object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- a/maps/SeafoamGym.asm
+++ b/maps/SeafoamGym.asm
@@ -1,6 +1,6 @@
object_const_def ; object_event constants
const SEAFOAMGYM_BLAINE
- const SEAFOAMGYM_GYM_GUY
+ const SEAFOAMGYM_GYM_GUIDE
SeafoamGym_MapScripts:
db 1 ; scene scripts
@@ -23,7 +23,7 @@
loadtrainer BLAINE, BLAINE1
startbattle
iftrue .ReturnAfterBattle
- appear SEAFOAMGYM_GYM_GUY
+ appear SEAFOAMGYM_GYM_GUIDE
.ReturnAfterBattle:
reloadmapafterbattle
setevent EVENT_BEAT_BLAINE
@@ -43,19 +43,19 @@
closetext
end
-SeafoamGymGuyScript:
+SeafoamGymGuideScript:
faceplayer
opentext
- checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
- iftrue .TalkedToSeafoamGymGuyScript
- writetext SeafoamGymGuyWinText
+ checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUIDE_ONCE
+ iftrue .TalkedToSeafoamGymGuideScript
+ writetext SeafoamGymGuideWinText
waitbutton
closetext
- setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE
+ setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUIDE_ONCE
end
-.TalkedToSeafoamGymGuyScript:
- writetext SeafoamGymGuyWinText2
+.TalkedToSeafoamGymGuideScript:
+ writetext SeafoamGymGuideWinText2
waitbutton
closetext
end
@@ -123,7 +123,7 @@
line "Just you watch!"
done
-SeafoamGymGuyWinText:
+SeafoamGymGuideWinText:
text "Yo!"
para "… Huh? It's over"
@@ -144,7 +144,7 @@
line "I knew you'd win!"
done
-SeafoamGymGuyWinText2:
+SeafoamGymGuideWinText2:
text "A #MON GYM can"
line "be anywhere as"
@@ -167,4 +167,4 @@
db 2 ; object events
object_event 5, 2, SPRITE_BLAINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, SeafoamGymBlaineScript, -1
- object_event 6, 5, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY
+ object_event 6, 5, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SeafoamGymGuideScript, EVENT_SEAFOAM_GYM_GYM_GUIDE
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,5 +1,5 @@
object_const_def ; object_event constants
- const SLOWPOKEWELLB2F_GYM_GUY
+ const SLOWPOKEWELLB2F_GYM_GUIDE
const SLOWPOKEWELLB2F_POKE_BALL
SlowpokeWellB2F_MapScripts:
@@ -7,12 +7,12 @@
db 0 ; callbacks
-SlowpokeWellB2FGymGuyScript:
+SlowpokeWellB2FGymGuideScript:
faceplayer
opentext
checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
iftrue .GotKingsRock
- writetext SlowpokeWellB2FGymGuyText
+ writetext SlowpokeWellB2FGymGuideText
promptbutton
verbosegiveitem KINGS_ROCK
iffalse .NoRoom
@@ -22,7 +22,7 @@
end
.GotKingsRock:
- writetext SlowpokeWellB2FGymGuyText_GotKingsRock
+ writetext SlowpokeWellB2FGymGuideText_GotKingsRock
waitbutton
closetext
end
@@ -30,7 +30,7 @@
SlowpokeWellB2FTMRainDance:
itemball TM_RAIN_DANCE
-SlowpokeWellB2FGymGuyText:
+SlowpokeWellB2FGymGuideText:
text "I'm waiting to see"
line "SLOWPOKE's moment"
cont "of evolution."
@@ -50,7 +50,7 @@
cont "you."
done
-SlowpokeWellB2FGymGuyText_GotKingsRock:
+SlowpokeWellB2FGymGuideText_GotKingsRock:
text "I'm going to be"
line "like SLOWPOKE."
@@ -70,5 +70,5 @@
db 0 ; bg events
db 2 ; object events
- object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuyScript, -1
+ object_event 5, 4, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, SlowpokeWellB2FGymGuideScript, -1
object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
--- a/maps/VermilionGym.asm
+++ b/maps/VermilionGym.asm
@@ -3,7 +3,7 @@
const VERMILIONGYM_GENTLEMAN
const VERMILIONGYM_ROCKER
const VERMILIONGYM_SUPER_NERD
- const VERMILIONGYM_GYM_GUY
+ const VERMILIONGYM_GYM_GUIDE
VermilionGym_MapScripts:
db 0 ; scene scripts
@@ -75,18 +75,18 @@
closetext
end
-VermilionGymGuyScript:
+VermilionGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_LTSURGE
- iftrue .VermilionGymGuyWinScript
- writetext VermilionGymGuyText
+ iftrue .VermilionGymGuideWinScript
+ writetext VermilionGymGuideText
waitbutton
closetext
end
-.VermilionGymGuyWinScript:
- writetext VermilionGymGuyWinText
+.VermilionGymGuideWinScript:
+ writetext VermilionGymGuideWinText
waitbutton
closetext
end
@@ -223,7 +223,7 @@
line "LT.SURGE is tough."
done
-VermilionGymGuyText:
+VermilionGymGuideText:
text "Yo! CHAMP in"
line "making!"
@@ -245,7 +245,7 @@
cont "LT.SURGE."
done
-VermilionGymGuyWinText:
+VermilionGymGuideWinText:
text "Whew! That was an"
line "electrifying bout!"
@@ -291,4 +291,4 @@
object_event 8, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanGregory, -1
object_event 4, 7, SPRITE_ROCKER, SPRITEMOVEDATA_STANDING_DOWN, 3, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerGuitaristVincent, -1
object_event 0, 10, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerJugglerHorton, -1
- object_event 7, 15, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuyScript, -1
+ object_event 7, 15, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, VermilionGymGuideScript, -1
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -2,7 +2,7 @@
const VIOLETGYM_FALKNER
const VIOLETGYM_YOUNGSTER1
const VIOLETGYM_YOUNGSTER2
- const VIOLETGYM_GYM_GUY
+ const VIOLETGYM_GYM_GUIDE
VioletGym_MapScripts:
db 0 ; scene scripts
@@ -86,18 +86,18 @@
closetext
end
-VioletGymGuyScript:
+VioletGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_FALKNER
- iftrue .VioletGymGuyWinScript
- writetext VioletGymGuyText
+ iftrue .VioletGymGuideWinScript
+ writetext VioletGymGuideText
waitbutton
closetext
end
-.VioletGymGuyWinScript:
- writetext VioletGymGuyWinText
+.VioletGymGuideWinScript:
+ writetext VioletGymGuideWinText
waitbutton
closetext
end
@@ -250,7 +250,7 @@
cont "rookie trainer…"
done
-VioletGymGuyText:
+VioletGymGuideText:
text "Hey! I'm no train-"
line "er but I can give"
cont "some advice!"
@@ -271,7 +271,7 @@
line "this in mind."
done
-VioletGymGuyWinText:
+VioletGymGuideWinText:
text "Nice battle! Keep"
line "it up, and you'll"
@@ -296,4 +296,4 @@
object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, VioletGymFalknerScript, -1
object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1
object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1
- object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1
+ object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuideScript, -1
--- a/maps/ViridianGym.asm
+++ b/maps/ViridianGym.asm
@@ -1,6 +1,6 @@
object_const_def ; object_event constants
const VIRIDIANGYM_BLUE
- const VIRIDIANGYM_GYM_GUY
+ const VIRIDIANGYM_GYM_GUIDE
ViridianGym_MapScripts:
db 0 ; scene scripts
@@ -36,18 +36,18 @@
closetext
end
-ViridianGymGuyScript:
+ViridianGymGuideScript:
faceplayer
opentext
checkevent EVENT_BEAT_BLUE
- iftrue .ViridianGymGuyWinScript
- writetext ViridianGymGuyText
+ iftrue .ViridianGymGuideWinScript
+ writetext ViridianGymGuideText
waitbutton
closetext
end
-.ViridianGymGuyWinScript:
- writetext ViridianGymGuyWinText
+.ViridianGymGuideWinScript:
+ writetext ViridianGymGuideWinText
waitbutton
closetext
end
@@ -136,7 +136,7 @@
cont "you. Got it?"
done
-ViridianGymGuyText:
+ViridianGymGuideText:
text "Yo, CHAMP in"
line "making!"
@@ -156,7 +156,7 @@
line "you've got!"
done
-ViridianGymGuyWinText:
+ViridianGymGuideWinText:
text "Man, you are truly"
line "tough…"
@@ -182,4 +182,4 @@
db 2 ; object events
object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE
- object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE
+ object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuideScript, EVENT_VIRIDIAN_GYM_BLUE