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

PokemonFanClub.asm: Update NPC names

Browse Source 
Includes the following NPC constant renames:

POKEMONFANCLUB_PRESIDENT --> POKEMONFANCLUB_CHAIRMAN
POKEMONFANCLUB_FISHER --> POKEMONFANCLUB_CLEFAIRY_GUY

Also update the Clefairy doll and Bayleef text labels.
This commit is contained in:
DeeDeeG
2019-04-28 01:25:01 -04:00
parent 3d5467abc8
commit 80e89b5539
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
maps/PokemonFanClub.asm
View File

@@ -1,7 +1,7 @@
object_const_def ; object_event constants object_const_def ; object_event constants
const POKEMONFANCLUB_GENTLEMAN const POKEMONFANCLUB_CHAIRMAN
const POKEMONFANCLUB_RECEPTIONIST const POKEMONFANCLUB_RECEPTIONIST
const POKEMONFANCLUB_FISHER const POKEMONFANCLUB_CLEFAIRY_GUY
const POKEMONFANCLUB_TEACHER const POKEMONFANCLUB_TEACHER
const POKEMONFANCLUB_FAIRY const POKEMONFANCLUB_FAIRY
const POKEMONFANCLUB_ODDISH const POKEMONFANCLUB_ODDISH
@@ -11,37 +11,37 @@ PokemonFanClub_MapScripts:
db 0 ; callbacks db 0 ; callbacks
PokemonFanClubPresidentScript: PokemonFanClubChairmanScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
iftrue .HeardSpeech iftrue .HeardSpeech
checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL
iftrue .HeardSpeechButBagFull iftrue .HeardSpeechButBagFull
writetext PokemonFanClubPresidentDidYouVisitToHearAboutMyMonText writetext PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText
yesorno yesorno
iffalse .NotListening iffalse .NotListening
writetext PokemonFanClubPresidentRapidashText writetext PokemonFanClubChairmanRapidashText
buttonsound buttonsound
.HeardSpeechButBagFull: .HeardSpeechButBagFull:
writetext PokemonFanClubPresidentIWantYouToHaveThisText writetext PokemonFanClubChairmanIWantYouToHaveThisText
buttonsound buttonsound
verbosegiveitem RARE_CANDY verbosegiveitem RARE_CANDY
iffalse .BagFull iffalse .BagFull
setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT setevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT
writetext PokemonFanClubPresidentItsARareCandyText writetext PokemonFanClubChairmanItsARareCandyText
waitbutton waitbutton
closetext closetext
end end
.HeardSpeech: .HeardSpeech:
writetext PokemonFanClubPresidentMoreTalesToTellText writetext PokemonFanClubChairmanMoreTalesToTellText
waitbutton waitbutton
closetext closetext
end end
.NotListening: .NotListening:
writetext PokemonFanClubPresidentHowDisappointingText writetext PokemonFanClubChairmanHowDisappointingText
waitbutton waitbutton
.BagFull: .BagFull:
closetext closetext
@@ -102,11 +102,11 @@ PokemonFanClubTeacherScript:
jumptextfaceplayer PokemonFanClubTeacherText jumptextfaceplayer PokemonFanClubTeacherText
PokemonFanClubClefairyDollScript: PokemonFanClubClefairyDollScript:
jumptext ClefairyDollText jumptext PokemonFanClubClefairyDollText
PokemonFanClubBayleefScript: PokemonFanClubBayleefScript:
opentext opentext
writetext FanClubBayleefText writetext PokemonFanClubBayleefText
cry BAYLEEF cry BAYLEEF
waitbutton waitbutton
closetext closetext
@@ -118,7 +118,7 @@ PokemonFanClubListenSign:
PokemonFanClubBraggingSign: PokemonFanClubBraggingSign:
jumptext PokemonFanClubBraggingSignText jumptext PokemonFanClubBraggingSignText
PokemonFanClubPresidentDidYouVisitToHearAboutMyMonText: PokemonFanClubChairmanDidYouVisitToHearAboutMyMonText:
text "I'm the CHAIRMAN" text "I'm the CHAIRMAN"
line "of the #MON FAN" line "of the #MON FAN"
cont "CLUB." cont "CLUB."
@@ -135,7 +135,7 @@ PokemonFanClubPresidentDidYouVisitToHearAboutMyMonText:
cont "#MON?" cont "#MON?"
done done
PokemonFanClubPresidentRapidashText: PokemonFanClubChairmanRapidashText:
text "Good!" text "Good!"
line "Then listen up!" line "Then listen up!"
@@ -161,13 +161,13 @@ PokemonFanClubPresidentRapidashText:
cont "you too long!" cont "you too long!"
done done
PokemonFanClubPresidentIWantYouToHaveThisText: PokemonFanClubChairmanIWantYouToHaveThisText:
text "Thanks for hearing" text "Thanks for hearing"
line "me out. I want you" line "me out. I want you"
cont "to have this!" cont "to have this!"
done done
PokemonFanClubPresidentItsARareCandyText: PokemonFanClubChairmanItsARareCandyText:
text "It's a RARE CANDY" text "It's a RARE CANDY"
line "that makes #MON" line "that makes #MON"
cont "stronger." cont "stronger."
@@ -179,7 +179,7 @@ PokemonFanClubPresidentItsARareCandyText:
line "you can have it." line "you can have it."
done done
PokemonFanClubPresidentMoreTalesToTellText: PokemonFanClubChairmanMoreTalesToTellText:
text "Hello, <PLAY_G>!" text "Hello, <PLAY_G>!"
para "Did you come see" para "Did you come see"
@@ -190,7 +190,7 @@ PokemonFanClubPresidentMoreTalesToTellText:
line "tales to tell…" line "tales to tell…"
done done
PokemonFanClubPresidentHowDisappointingText: PokemonFanClubChairmanHowDisappointingText:
text "How disappointing…" text "How disappointing…"
para "Come back if you" para "Come back if you"
@@ -270,7 +270,7 @@ PokemonFanClubTeacherText:
line "head is so cute!" line "head is so cute!"
done done
ClefairyDollText: PokemonFanClubClefairyDollText:
text "It's a CLEFAIRY!" text "It's a CLEFAIRY!"
line "Huh?" line "Huh?"
@@ -279,7 +279,7 @@ ClefairyDollText:
cont "DOLL." cont "DOLL."
done done
FanClubBayleefText: PokemonFanClubBayleefText:
text "BAYLEEF: Li liif!" text "BAYLEEF: Li liif!"
done done
@@ -308,7 +308,7 @@ PokemonFanClub_MapEvents:
bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign bg_event 9, 0, BGEVENT_READ, PokemonFanClubBraggingSign
db 6 ; object events db 6 ; object events
object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubPresidentScript, -1 object_event 3, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubChairmanScript, -1
object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1 object_event 4, 1, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokemonFanClubReceptionistScript, -1
object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1 object_event 2, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubClefairyGuyScript, -1
object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1 object_event 7, 2, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PokemonFanClubTeacherScript, -1