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

Merge remote-tracking branch 'surskitty/master' into master

Browse Source
This commit is contained in:
yenatch
2018-03-10 16:10:00 -05:00
parent ab2677277e 96dcc3c0ca
commit 4e4d9c9083
3 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
maps/CeladonGym.asm
View File

@@ -16,10 +16,10 @@ CeladonGymErikaScript:
opentext opentext
checkflag ENGINE_RAINBOWBADGE checkflag ENGINE_RAINBOWBADGE
iftrue .FightDone iftrue .FightDone
writetext UnknownText_0x72b28 writetext ErikaBeforeBattleText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x72c3e, 0 winlosstext ErikaBeatenText, 0
loadtrainer ERIKA, ERIKA1 loadtrainer ERIKA, ERIKA1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
@@ -29,20 +29,20 @@ CeladonGymErikaScript:
setevent EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_BEAUTY_JULIA
setevent EVENT_BEAT_TWINS_JO_AND_ZOE setevent EVENT_BEAT_TWINS_JO_AND_ZOE
opentext opentext
writetext UnknownText_0x72c96 writetext PlayerReceivedRainbowBadgeText
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitsfx waitsfx
setflag ENGINE_RAINBOWBADGE setflag ENGINE_RAINBOWBADGE
.FightDone: .FightDone:
checkevent EVENT_GOT_TM19_GIGA_DRAIN checkevent EVENT_GOT_TM19_GIGA_DRAIN
iftrue .GotGigaDrain iftrue .GotGigaDrain
writetext UnknownText_0x72cb0 writetext ErikaExplainTMText
buttonsound buttonsound
verbosegiveitem TM_GIGA_DRAIN verbosegiveitem TM_GIGA_DRAIN
iffalse .GotGigaDrain iffalse .GotGigaDrain
setevent EVENT_GOT_TM19_GIGA_DRAIN setevent EVENT_GOT_TM19_GIGA_DRAIN
.GotGigaDrain: .GotGigaDrain:
writetext UnknownText_0x72d8f writetext ErikaAfterBattleText
waitbutton waitbutton
closetext closetext
end end
@@ -80,24 +80,24 @@ TrainerBeautyJulia:
closetext closetext
end end
TrainerTwinsJoandzoe1: TrainerTwinsJoAndZoe1:
trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe1SeenText, TwinsJoAndZoe1BeatenText, 0, .Script
.Script: .Script:
endifjustbattled endifjustbattled
opentext opentext
writetext TwinsJoandzoe1AfterBattleText writetext TwinsJoAndZoe1AfterBattleText
waitbutton waitbutton
closetext closetext
end end
TrainerTwinsJoandzoe2: TrainerTwinsJoAndZoe2:
trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe2SeenText, TwinsJoAndZoe2BeatenText, 0, .Script
.Script: .Script:
endifjustbattled endifjustbattled
opentext opentext
writetext TwinsJoandzoe2AfterBattleText writetext TwinsJoAndZoe2AfterBattleText
waitbutton waitbutton
closetext closetext
end end
@@ -110,7 +110,7 @@ CeladonGymStatue:
trainertotext ERIKA, ERIKA1, MEM_BUFFER_1 trainertotext ERIKA, ERIKA1, MEM_BUFFER_1
jumpstd gymstatue2 jumpstd gymstatue2
UnknownText_0x72b28: ErikaBeforeBattleText:
text "ERIKA: Hello…" text "ERIKA: Hello…"
line "Lovely weather," line "Lovely weather,"
@@ -138,7 +138,7 @@ UnknownText_0x72b28:
line "shall not lose." line "shall not lose."
done done
UnknownText_0x72c3e: ErikaBeatenText:
text "ERIKA: Oh!" text "ERIKA: Oh!"
line "I concede defeat…" line "I concede defeat…"
@@ -149,12 +149,12 @@ UnknownText_0x72c3e:
line "RAINBOWBADGE…" line "RAINBOWBADGE…"
done done
UnknownText_0x72c96: PlayerReceivedRainbowBadgeText:
text "<PLAYER> received" text "<PLAYER> received"
line "RAINBOWBADGE." line "RAINBOWBADGE."
done done
UnknownText_0x72cb0: ErikaExplainTMText:
text "ERIKA: That was a" text "ERIKA: That was a"
line "delightful match." line "delightful match."
@@ -175,7 +175,7 @@ UnknownText_0x72cb0:
line "it pleases you…" line "it pleases you…"
done done
UnknownText_0x72d8f: ErikaAfterBattleText:
text "ERIKA: Losing" text "ERIKA: Losing"
line "leaves a bitter" line "leaves a bitter"
cont "aftertaste…" cont "aftertaste…"
@@ -236,31 +236,31 @@ BeautyJuliaAfterBattleText:
cont "like ERIKA?" cont "like ERIKA?"
done done
TwinsJoandzoe1SeenText: TwinsJoAndZoe1SeenText:
text "We'll show you" text "We'll show you"
line "#MON moves that" line "#MON moves that"
cont "ERIKA taught us!" cont "ERIKA taught us!"
done done
TwinsJoandzoe1BeatenText: TwinsJoAndZoe1BeatenText:
text "Oh… We lost…" text "Oh… We lost…"
done done
TwinsJoandzoe1AfterBattleText: TwinsJoAndZoe1AfterBattleText:
text "ERIKA will get you" text "ERIKA will get you"
line "back for us!" line "back for us!"
done done
TwinsJoandzoe2SeenText: TwinsJoAndZoe2SeenText:
text "We're going to" text "We're going to"
line "protect ERIKA!" line "protect ERIKA!"
done done
TwinsJoandzoe2BeatenText: TwinsJoAndZoe2BeatenText:
text "We couldn't win…" text "We couldn't win…"
done done
TwinsJoandzoe2AfterBattleText: TwinsJoAndZoe2AfterBattleText:
text "ERIKA is much," text "ERIKA is much,"
line "much stronger!" line "much stronger!"
done done
@@ -283,5 +283,5 @@ CeladonGym_MapEvents:
object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1 object_event 7, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassMichelle, -1
object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1 object_event 2, 8, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerPicnickerTanya, -1
object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1 object_event 3, 5, SPRITE_BUENA, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulia, -1
object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe1, -1 object_event 4, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe1, -1
object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoandzoe2, -1 object_event 5, 10, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsJoAndZoe2, -1

32
maps/GoldenrodGym.asm
View File

@@ -24,10 +24,10 @@ GoldenrodGymWhitneyScript:
checkevent EVENT_BEAT_WHITNEY checkevent EVENT_BEAT_WHITNEY
iftrue .FightDone iftrue .FightDone
opentext opentext
writetext UnknownText_0x54122 writetext WhitneyBeforeText
waitbutton waitbutton
closetext closetext
winlosstext UnknownText_0x541a5, 0 winlosstext WhitneyShouldntBeSoSeriousText, 0
loadtrainer WHITNEY, WHITNEY1 loadtrainer WHITNEY, WHITNEY1
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
@@ -42,7 +42,7 @@ GoldenrodGymWhitneyScript:
opentext opentext
checkevent EVENT_MADE_WHITNEY_CRY checkevent EVENT_MADE_WHITNEY_CRY
iffalse .StoppedCrying iffalse .StoppedCrying
writetext UnknownText_0x541f4 writetext WhitneyYouMeanieText
waitbutton waitbutton
closetext closetext
end end
@@ -52,28 +52,28 @@ GoldenrodGymWhitneyScript:
iftrue .GotAttract iftrue .GotAttract
checkflag ENGINE_PLAINBADGE checkflag ENGINE_PLAINBADGE
iftrue .GotPlainBadge iftrue .GotPlainBadge
writetext UnknownText_0x54222 writetext WhitneyWhatDoYouWantText
buttonsound buttonsound
waitsfx waitsfx
writetext UnknownText_0x54273 writetext PlayerReceivedPlainBadgeText
playsound SFX_GET_BADGE playsound SFX_GET_BADGE
waitsfx waitsfx
setflag ENGINE_PLAINBADGE setflag ENGINE_PLAINBADGE
checkcode VAR_BADGES checkcode VAR_BADGES
scall GoldenrodGymActivateRockets scall GoldenrodGymActivateRockets
.GotPlainBadge: .GotPlainBadge:
writetext UnknownText_0x5428b writetext WhitneyPlainBadgeText
buttonsound buttonsound
verbosegiveitem TM_ATTRACT verbosegiveitem TM_ATTRACT
iffalse .NoRoomForAttract iffalse .NoRoomForAttract
setevent EVENT_GOT_TM45_ATTRACT setevent EVENT_GOT_TM45_ATTRACT
writetext UnknownText_0x54302 writetext WhitneyAttractText
waitbutton waitbutton
closetext closetext
end end
.GotAttract: .GotAttract:
writetext UnknownText_0x54360 writetext WhitneyGoodCryText
waitbutton waitbutton
.NoRoomForAttract: .NoRoomForAttract:
closetext closetext
@@ -182,7 +182,7 @@ BridgetWalksAwayMovement:
turn_head LEFT turn_head LEFT
step_end step_end
UnknownText_0x54122: WhitneyBeforeText:
text "Hi! I'm WHITNEY!" text "Hi! I'm WHITNEY!"
para "Everyone was into" para "Everyone was into"
@@ -197,7 +197,7 @@ UnknownText_0x54122:
cont "you--I'm good!" cont "you--I'm good!"
done done
UnknownText_0x541a5: WhitneyShouldntBeSoSeriousText:
text "Sob…" text "Sob…"
para "…Waaaaaaah!" para "…Waaaaaaah!"
@@ -208,7 +208,7 @@ UnknownText_0x541a5:
cont "you child, you!" cont "you child, you!"
done done
UnknownText_0x541f4: WhitneyYouMeanieText:
text "Waaaaah!" text "Waaaaah!"
para "Waaaaah!" para "Waaaaah!"
@@ -217,7 +217,7 @@ UnknownText_0x541f4:
line "…You meanie!" line "…You meanie!"
done done
UnknownText_0x54222: WhitneyWhatDoYouWantText:
text "…Sniff…" text "…Sniff…"
para "What? What do you" para "What? What do you"
@@ -228,12 +228,12 @@ UnknownText_0x54222:
cont "PLAINBADGE." cont "PLAINBADGE."
done done
UnknownText_0x54273: PlayerReceivedPlainBadgeText:
text "<PLAYER> received" text "<PLAYER> received"
line "PLAINBADGE." line "PLAINBADGE."
done done
UnknownText_0x5428b: WhitneyPlainBadgeText:
text "PLAINBADGE lets" text "PLAINBADGE lets"
line "your #MON use" line "your #MON use"
@@ -248,7 +248,7 @@ UnknownText_0x5428b:
line "this too!" line "this too!"
done done
UnknownText_0x54302: WhitneyAttractText:
text "It's ATTRACT!" text "It's ATTRACT!"
line "It makes full use" line "It makes full use"
@@ -260,7 +260,7 @@ UnknownText_0x54302:
cont "like me?" cont "like me?"
done done
UnknownText_0x54360: WhitneyGoodCryText:
text "Ah, that was a" text "Ah, that was a"
line "good cry!" line "good cry!"

20
maps/SproutTower3F.asm
View File

@@ -43,12 +43,12 @@ SproutTower3FRivalScene:
applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
playmusic MUSIC_RIVAL_ENCOUNTER playmusic MUSIC_RIVAL_ENCOUNTER
opentext opentext
writetext UnknownText_0x184aec writetext SproutTowerRivalOnlyCareAboutStrongText
waitbutton waitbutton
closetext closetext
turnobject SPROUTTOWER3F_SILVER, UP turnobject SPROUTTOWER3F_SILVER, UP
opentext opentext
writetext UnknownText_0x184bc8 writetext SproutTowerRivalUsedEscapeRopeText
pause 15 pause 15
closetext closetext
playsound SFX_WARP_TO playsound SFX_WARP_TO
@@ -74,18 +74,18 @@ SageLiScript:
startbattle startbattle
reloadmapafterbattle reloadmapafterbattle
opentext opentext
writetext UnknownText_0x184cc2 writetext SageLiTakeThisFlashText
buttonsound buttonsound
verbosegiveitem HM_FLASH verbosegiveitem HM_FLASH
setevent EVENT_GOT_HM05_FLASH setevent EVENT_GOT_HM05_FLASH
setevent EVENT_BEAT_SAGE_LI setevent EVENT_BEAT_SAGE_LI
writetext UnknownText_0x184d13 writetext SageLiFlashExplanationText
waitbutton waitbutton
closetext closetext
end end
.GotFlash: .GotFlash:
writetext UnknownText_0x184d88 writetext SageLiAfterBattleText
waitbutton waitbutton
closetext closetext
end end
@@ -172,7 +172,7 @@ UnknownText_0x184a27:
line "tools of war…" line "tools of war…"
done done
UnknownText_0x184aec: SproutTowerRivalOnlyCareAboutStrongText:
text "…" text "…"
line "…Humph!" line "…Humph!"
@@ -198,7 +198,7 @@ UnknownText_0x184aec:
cont "weak #MON." cont "weak #MON."
done done
UnknownText_0x184bc8: SproutTowerRivalUsedEscapeRopeText:
text "<RIVAL> used an" text "<RIVAL> used an"
line "ESCAPE ROPE!" line "ESCAPE ROPE!"
done done
@@ -230,7 +230,7 @@ SageLiBeatenText:
text "Ah, excellent!" text "Ah, excellent!"
done done
UnknownText_0x184cc2: SageLiTakeThisFlashText:
text "You and your #-" text "You and your #-"
line "MON should have" line "MON should have"
@@ -241,7 +241,7 @@ UnknownText_0x184cc2:
line "HM." line "HM."
done done
UnknownText_0x184d13: SageLiFlashExplanationText:
text "FLASH illuminates" text "FLASH illuminates"
line "even the darkest" line "even the darkest"
cont "of all places." cont "of all places."
@@ -253,7 +253,7 @@ UnknownText_0x184d13:
line "from VIOLET's GYM." line "from VIOLET's GYM."
done done
UnknownText_0x184d88: SageLiAfterBattleText:
text "I hope you learn" text "I hope you learn"
line "and grow from your" line "and grow from your"
cont "journey." cont "journey."