diff options
| -rw-r--r-- | maps/CeladonGym.asm | 48 | ||||
| -rw-r--r-- | maps/GoldenrodGym.asm | 32 | ||||
| -rw-r--r-- | maps/SproutTower3F.asm | 20 |
3 files changed, 50 insertions, 50 deletions
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 4e33cb3f3..e444aaa64 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -16,10 +16,10 @@ CeladonGymErikaScript: opentext checkflag ENGINE_RAINBOWBADGE iftrue .FightDone - writetext UnknownText_0x72b28 + writetext ErikaBeforeBattleText waitbutton closetext - winlosstext UnknownText_0x72c3e, 0 + winlosstext ErikaBeatenText, 0 loadtrainer ERIKA, ERIKA1 startbattle reloadmapafterbattle @@ -29,20 +29,20 @@ CeladonGymErikaScript: setevent EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_TWINS_JO_AND_ZOE opentext - writetext UnknownText_0x72c96 + writetext PlayerReceivedRainbowBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_RAINBOWBADGE .FightDone: checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue .GotGigaDrain - writetext UnknownText_0x72cb0 + writetext ErikaExplainTMText buttonsound verbosegiveitem TM_GIGA_DRAIN iffalse .GotGigaDrain setevent EVENT_GOT_TM19_GIGA_DRAIN .GotGigaDrain: - writetext UnknownText_0x72d8f + writetext ErikaAfterBattleText waitbutton closetext end @@ -80,24 +80,24 @@ TrainerBeautyJulia: closetext end -TrainerTwinsJoandzoe1: - trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, .Script +TrainerTwinsJoAndZoe1: + trainer TWINS, JOANDZOE1, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe1SeenText, TwinsJoAndZoe1BeatenText, 0, .Script .Script: endifjustbattled opentext - writetext TwinsJoandzoe1AfterBattleText + writetext TwinsJoAndZoe1AfterBattleText waitbutton closetext end -TrainerTwinsJoandzoe2: - trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, .Script +TrainerTwinsJoAndZoe2: + trainer TWINS, JOANDZOE2, EVENT_BEAT_TWINS_JO_AND_ZOE, TwinsJoAndZoe2SeenText, TwinsJoAndZoe2BeatenText, 0, .Script .Script: endifjustbattled opentext - writetext TwinsJoandzoe2AfterBattleText + writetext TwinsJoAndZoe2AfterBattleText waitbutton closetext end @@ -110,7 +110,7 @@ CeladonGymStatue: trainertotext ERIKA, ERIKA1, MEM_BUFFER_1 jumpstd gymstatue2 -UnknownText_0x72b28: +ErikaBeforeBattleText: text "ERIKA: Hello…" line "Lovely weather," @@ -138,7 +138,7 @@ UnknownText_0x72b28: line "shall not lose." done -UnknownText_0x72c3e: +ErikaBeatenText: text "ERIKA: Oh!" line "I concede defeat…" @@ -149,12 +149,12 @@ UnknownText_0x72c3e: line "RAINBOWBADGE…" done -UnknownText_0x72c96: +PlayerReceivedRainbowBadgeText: text "<PLAYER> received" line "RAINBOWBADGE." done -UnknownText_0x72cb0: +ErikaExplainTMText: text "ERIKA: That was a" line "delightful match." @@ -175,7 +175,7 @@ UnknownText_0x72cb0: line "it pleases you…" done -UnknownText_0x72d8f: +ErikaAfterBattleText: text "ERIKA: Losing" line "leaves a bitter" cont "aftertaste…" @@ -236,31 +236,31 @@ BeautyJuliaAfterBattleText: cont "like ERIKA?" done -TwinsJoandzoe1SeenText: +TwinsJoAndZoe1SeenText: text "We'll show you" line "#MON moves that" cont "ERIKA taught us!" done -TwinsJoandzoe1BeatenText: +TwinsJoAndZoe1BeatenText: text "Oh… We lost…" done -TwinsJoandzoe1AfterBattleText: +TwinsJoAndZoe1AfterBattleText: text "ERIKA will get you" line "back for us!" done -TwinsJoandzoe2SeenText: +TwinsJoAndZoe2SeenText: text "We're going to" line "protect ERIKA!" done -TwinsJoandzoe2BeatenText: +TwinsJoAndZoe2BeatenText: text "We couldn't win…" done -TwinsJoandzoe2AfterBattleText: +TwinsJoAndZoe2AfterBattleText: text "ERIKA is much," line "much stronger!" 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 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 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 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 diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 5ccf7974c..aa3a6e5ba 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -24,10 +24,10 @@ GoldenrodGymWhitneyScript: checkevent EVENT_BEAT_WHITNEY iftrue .FightDone opentext - writetext UnknownText_0x54122 + writetext WhitneyBeforeText waitbutton closetext - winlosstext UnknownText_0x541a5, 0 + winlosstext WhitneyShouldntBeSoSeriousText, 0 loadtrainer WHITNEY, WHITNEY1 startbattle reloadmapafterbattle @@ -42,7 +42,7 @@ GoldenrodGymWhitneyScript: opentext checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying - writetext UnknownText_0x541f4 + writetext WhitneyYouMeanieText waitbutton closetext end @@ -52,28 +52,28 @@ GoldenrodGymWhitneyScript: iftrue .GotAttract checkflag ENGINE_PLAINBADGE iftrue .GotPlainBadge - writetext UnknownText_0x54222 + writetext WhitneyWhatDoYouWantText buttonsound waitsfx - writetext UnknownText_0x54273 + writetext PlayerReceivedPlainBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES scall GoldenrodGymActivateRockets .GotPlainBadge: - writetext UnknownText_0x5428b + writetext WhitneyPlainBadgeText buttonsound verbosegiveitem TM_ATTRACT iffalse .NoRoomForAttract setevent EVENT_GOT_TM45_ATTRACT - writetext UnknownText_0x54302 + writetext WhitneyAttractText waitbutton closetext end .GotAttract: - writetext UnknownText_0x54360 + writetext WhitneyGoodCryText waitbutton .NoRoomForAttract: closetext @@ -182,7 +182,7 @@ BridgetWalksAwayMovement: turn_head LEFT step_end -UnknownText_0x54122: +WhitneyBeforeText: text "Hi! I'm WHITNEY!" para "Everyone was into" @@ -197,7 +197,7 @@ UnknownText_0x54122: cont "you--I'm good!" done -UnknownText_0x541a5: +WhitneyShouldntBeSoSeriousText: text "Sob…" para "…Waaaaaaah!" @@ -208,7 +208,7 @@ UnknownText_0x541a5: cont "you child, you!" done -UnknownText_0x541f4: +WhitneyYouMeanieText: text "Waaaaah!" para "Waaaaah!" @@ -217,7 +217,7 @@ UnknownText_0x541f4: line "…You meanie!" done -UnknownText_0x54222: +WhitneyWhatDoYouWantText: text "…Sniff…" para "What? What do you" @@ -228,12 +228,12 @@ UnknownText_0x54222: cont "PLAINBADGE." done -UnknownText_0x54273: +PlayerReceivedPlainBadgeText: text "<PLAYER> received" line "PLAINBADGE." done -UnknownText_0x5428b: +WhitneyPlainBadgeText: text "PLAINBADGE lets" line "your #MON use" @@ -248,7 +248,7 @@ UnknownText_0x5428b: line "this too!" done -UnknownText_0x54302: +WhitneyAttractText: text "It's ATTRACT!" line "It makes full use" @@ -260,7 +260,7 @@ UnknownText_0x54302: cont "like me?" done -UnknownText_0x54360: +WhitneyGoodCryText: text "Ah, that was a" line "good cry!" diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 3bc3ccc21..0462f279a 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -43,12 +43,12 @@ SproutTower3FRivalScene: applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER opentext - writetext UnknownText_0x184aec + writetext SproutTowerRivalOnlyCareAboutStrongText waitbutton closetext turnobject SPROUTTOWER3F_SILVER, UP opentext - writetext UnknownText_0x184bc8 + writetext SproutTowerRivalUsedEscapeRopeText pause 15 closetext playsound SFX_WARP_TO @@ -74,18 +74,18 @@ SageLiScript: startbattle reloadmapafterbattle opentext - writetext UnknownText_0x184cc2 + writetext SageLiTakeThisFlashText buttonsound verbosegiveitem HM_FLASH setevent EVENT_GOT_HM05_FLASH setevent EVENT_BEAT_SAGE_LI - writetext UnknownText_0x184d13 + writetext SageLiFlashExplanationText waitbutton closetext end .GotFlash: - writetext UnknownText_0x184d88 + writetext SageLiAfterBattleText waitbutton closetext end @@ -172,7 +172,7 @@ UnknownText_0x184a27: line "tools of war…" done -UnknownText_0x184aec: +SproutTowerRivalOnlyCareAboutStrongText: text "…" line "…Humph!" @@ -198,7 +198,7 @@ UnknownText_0x184aec: cont "weak #MON." done -UnknownText_0x184bc8: +SproutTowerRivalUsedEscapeRopeText: text "<RIVAL> used an" line "ESCAPE ROPE!" done @@ -230,7 +230,7 @@ SageLiBeatenText: text "Ah, excellent!" done -UnknownText_0x184cc2: +SageLiTakeThisFlashText: text "You and your #-" line "MON should have" @@ -241,7 +241,7 @@ UnknownText_0x184cc2: line "HM." done -UnknownText_0x184d13: +SageLiFlashExplanationText: text "FLASH illuminates" line "even the darkest" cont "of all places." @@ -253,7 +253,7 @@ UnknownText_0x184d13: line "from VIOLET's GYM." done -UnknownText_0x184d88: +SageLiAfterBattleText: text "I hope you learn" line "and grow from your" cont "journey." |