From 1494c7968866ddc008a2a079e3ce95edc33acbc6 Mon Sep 17 00:00:00 2001 From: surskitty Date: Fri, 2 Mar 2018 21:39:29 -0500 Subject: [PATCH 1/4] Labelling Whitney texts --- maps/GoldenrodGym.asm | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index cdf754bad..98982640d 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -24,10 +24,10 @@ WhitneyScript_0x5400c: 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,40 +42,40 @@ WhitneyScript_0x5400c: opentext checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying - writetext UnknownText_0x541f4 + writetext WhitneyYouMeanieText waitbutton closetext end .StoppedCrying: checkevent EVENT_GOT_TM45_ATTRACT - iftrue UnknownScript_0x54077 + iftrue .GotAttract checkflag ENGINE_PLAINBADGE - iftrue UnknownScript_0x54064 - writetext UnknownText_0x54222 + iftrue .GotBadge + writetext WhitneyWhatDoYouWantText buttonsound waitsfx - writetext UnknownText_0x54273 + writetext PlayerReceivedPlainBadgeText playsound SFX_GET_BADGE waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES scall GoldenrodGymActivateRockets -UnknownScript_0x54064: - writetext UnknownText_0x5428b +.GotBadge: + writetext WhitneyPlainBadgeText buttonsound verbosegiveitem TM_ATTRACT - iffalse UnknownScript_0x5407b + iffalse .NoRoom setevent EVENT_GOT_TM45_ATTRACT - writetext UnknownText_0x54302 + writetext WhitneyAttractText waitbutton closetext end -UnknownScript_0x54077: - writetext UnknownText_0x54360 +.GotAttract: + writetext WhitneyGoodCryText waitbutton -UnknownScript_0x5407b: +.NoRoom: closetext end @@ -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 " 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!" From 1de25bc957c4d0fa2295dff90e0d92a2372a7bdd Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 7 Mar 2018 22:05:14 -0500 Subject: [PATCH 2/4] Labelling Erika and Celadon Gym --- maps/CeladonGym.asm | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 246b30a39..6134f3959 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -16,10 +16,10 @@ ErikaScript_0x72a6a: 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 @@ ErikaScript_0x72a6a: 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 UnknownScript_0x72aae - writetext UnknownText_0x72cb0 + iftrue .AfterTM + writetext ErikaExplainTMText buttonsound verbosegiveitem TM_GIGA_DRAIN - iffalse UnknownScript_0x72aae + iffalse .AfterTM setevent EVENT_GOT_TM19_GIGA_DRAIN -UnknownScript_0x72aae: - writetext UnknownText_0x72d8f +.AfterTM: + 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 " 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 From 55c69c487121978ab9431b1339d148d3f3ebaced Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 7 Mar 2018 22:13:24 -0500 Subject: [PATCH 3/4] Sprout Tower labels --- maps/SproutTower1F.asm | 10 ++++---- maps/SproutTower2F.asm | 8 +++---- maps/SproutTower3F.asm | 52 +++++++++++++++++++++--------------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 42a2c74ea..c29bc3fd2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -37,8 +37,8 @@ TrainerSageChow: SproutTower1FParlyzHeal: itemball PARLYZ_HEAL -MapSproutTower1FSignpost1Script: - jumptext UnknownText_0x1846d6 +SproutTower1FBellsproutStatueScript: + jumptext SproutTower1FBellsproutStatueText SageChowSeenText: text "We stand guard in" @@ -93,7 +93,7 @@ SproutTower1FTeacherText: line "ing upstairs." done -UnknownText_0x1846d6: +SproutTower1FBellsproutStatueText: text "A #MON statue…" para "It looks very" @@ -113,8 +113,8 @@ SproutTower1F_MapEvents: db 0 ; coord events db 2 ; bg events - bg_event 7, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script - bg_event 12, 15, BGEVENT_READ, MapSproutTower1FSignpost1Script + bg_event 7, 15, BGEVENT_READ, SproutTower1FBellsproutStatueScript + bg_event 12, 15, BGEVENT_READ, SproutTower1FBellsproutStatueScript db 6 ; object events object_event 7, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SproutTower1FSage1Script, -1 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 7606c3227..41c5cc183 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -30,8 +30,8 @@ TrainerSageEdmond: closetext end -MapSproutTower2FSignpost0Script: - jumptext UnknownText_0x1848c8 +SproutTower2FBellsproutStatueScript: + jumptext SproutTower2FBellsproutStatueText SproutTower2FXAccuracy: itemball X_ACCURACY @@ -75,7 +75,7 @@ SageEdmondAfterBattleText: line "well enough." done -UnknownText_0x1848c8: +SproutTower2FBellsproutStatueText: text "A #MON statue…" para "It looks very" @@ -94,7 +94,7 @@ SproutTower2F_MapEvents: db 0 ; coord events db 1 ; bg events - bg_event 12, 15, BGEVENT_READ, MapSproutTower2FSignpost0Script + bg_event 12, 15, BGEVENT_READ, SproutTower2FBellsproutStatueScript db 3 ; object events object_event 12, 3, SPRITE_SAGE, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerSageNico, -1 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 8121d2d4a..13b9b2f70 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -20,7 +20,7 @@ SproutTower3F_MapScripts: .DummyScene1: end -UnknownScript_0x184947: +SproutTower3FRivalEvent: turnobject PLAYER, UP showemote EMOTE_SHOCK, PLAYER, 15 special FadeOutMusic @@ -43,12 +43,12 @@ UnknownScript_0x184947: 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 @@ -65,7 +65,7 @@ SageLiScript: faceplayer opentext checkevent EVENT_GOT_HM05_FLASH - iftrue UnknownScript_0x1849d1 + iftrue .GotFlash writetext SageLiSeenText waitbutton closetext @@ -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 -UnknownScript_0x1849d1: - writetext UnknownText_0x184d88 +.GotFlash: + writetext SageLiAfterBattleText waitbutton closetext end @@ -123,11 +123,11 @@ TrainerSageNeal: closetext end -MapSproutTower3FSignpost3Script: - jumptext UnknownText_0x184f37 +SproutTower3FBellsproutPaintingScript: + jumptext SproutTower3FBellsproutPaintingText -MapSproutTower3FSignpost5Script: - jumptext UnknownText_0x184f61 +SproutTower3FBellsproutStatueScript: + jumptext SproutTower3FBellsproutStatueText SproutTower3FPotion: itemball POTION @@ -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 " 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." @@ -314,13 +314,13 @@ SageNealAfterBattleText: line "on your journey." done -UnknownText_0x184f37: +SproutTower3FBellsproutPaintingText: text "It's a powerful" line "painting of a" cont "BELLSPROUT." done -UnknownText_0x184f61: +SproutTower3FBellsproutStatueText: text "A #MON statue…" para "It looks very" @@ -334,15 +334,15 @@ SproutTower3F_MapEvents: warp_event 10, 14, SPROUT_TOWER_2F, 4 db 1 ; coord events - coord_event 11, 9, SCENE_DEFAULT, UnknownScript_0x184947 + coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalEvent db 6 ; bg events - bg_event 8, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 11, 1, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 9, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 10, 0, BGEVENT_READ, MapSproutTower3FSignpost3Script - bg_event 5, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script - bg_event 14, 15, BGEVENT_READ, MapSproutTower3FSignpost5Script + bg_event 8, 1, BGEVENT_READ, SproutTower3FBellsproutStatueScript + bg_event 11, 1, BGEVENT_READ, SproutTower3FBellsproutStatueScript + bg_event 9, 0, BGEVENT_READ, SproutTower3FBellsproutPaintingScript + bg_event 10, 0, BGEVENT_READ, SproutTower3FBellsproutPaintingScript + bg_event 5, 15, BGEVENT_READ, SproutTower3FBellsproutStatueScript + bg_event 14, 15, BGEVENT_READ, SproutTower3FBellsproutStatueScript db 7 ; object events object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 From 96dcc3c0caa854734e849ce11d54bfc4841e2af1 Mon Sep 17 00:00:00 2001 From: surskitty Date: Wed, 7 Mar 2018 22:27:03 -0500 Subject: [PATCH 4/4] Labels, labels. --- maps/PowerPlant.asm | 44 +++++++++++++++++++------------------- maps/TeamRocketBaseB1F.asm | 34 ++++++++++++++--------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 73b1b0aed..48d73c092 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -47,21 +47,21 @@ OfficerScript_0x188df5: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188e0f + iftrue .ReturnedPart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT - iftrue UnknownScript_0x188e09 + iftrue .MetManager writetext UnknownText_0x188ee0 waitbutton closetext end -UnknownScript_0x188e09: +.MetManager: writetext UnknownText_0x188f7f waitbutton closetext end -UnknownScript_0x188e0f: +.ReturnedPart: writetext UnknownText_0x188fa2 waitbutton closetext @@ -71,13 +71,13 @@ GymGuyScript_0x188e15: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188e23 + iftrue .ReturnedPart writetext UnknownText_0x188fcf waitbutton closetext end -UnknownScript_0x188e23: +.ReturnedPart: writetext UnknownText_0x189038 waitbutton closetext @@ -87,13 +87,13 @@ GymGuyScript_0x188e29: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188e37 + iftrue .ReturnedPart writetext UnknownText_0x189079 waitbutton closetext end -UnknownScript_0x188e37: +.ReturnedPart: writetext UnknownText_0x1890ef waitbutton closetext @@ -103,13 +103,13 @@ OfficerScript_0x188e3d: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188e4b + iftrue .ReturnedPart writetext UnknownText_0x18910e waitbutton closetext end -UnknownScript_0x188e4b: +.ReturnedPart: writetext UnknownText_0x18917f waitbutton closetext @@ -119,13 +119,13 @@ GymGuyScript_0x188e51: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188e5f + iftrue .ReturnedPart writetext UnknownText_0x1891c2 waitbutton closetext end -UnknownScript_0x188e5f: +.ReturnedPart: writetext UnknownText_0x189225 waitbutton closetext @@ -135,11 +135,11 @@ PowerPlantManager: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x188eac + iftrue .ReturnedPart checkitem MACHINE_PART - iftrue UnknownScript_0x188e93 + iftrue .HoldingPart checkevent EVENT_MET_MANAGER_AT_POWER_PLANT - iftrue UnknownScript_0x188e8d + iftrue .MetManager writetext UnknownText_0x189264 waitbutton closetext @@ -150,13 +150,13 @@ PowerPlantManager: setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL end -UnknownScript_0x188e8d: +.MetManager: writetext UnknownText_0x189308 waitbutton closetext end -UnknownScript_0x188e93: +.HoldingPart: writetext UnknownText_0x18936e buttonsound takeitem MACHINE_PART @@ -166,21 +166,21 @@ UnknownScript_0x188e93: setevent EVENT_ROUTE_24_ROCKET setevent EVENT_RESTORED_POWER_TO_KANTO clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN -UnknownScript_0x188eac: +.ReturnedPart: checkevent EVENT_GOT_TM07_ZAP_CANNON - iftrue UnknownScript_0x188ec5 + iftrue .GotTM writetext UnknownText_0x1893c4 buttonsound verbosegiveitem TM_ZAP_CANNON - iffalse UnknownScript_0x188ec3 + iffalse .NoRoom setevent EVENT_GOT_TM07_ZAP_CANNON writetext UnknownText_0x1893f4 waitbutton -UnknownScript_0x188ec3: +.NoRoom: closetext end -UnknownScript_0x188ec5: +.GotTM: writetext UnknownText_0x189475 waitbutton closetext diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 3985c5c3e..7f2b964fb 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -500,17 +500,17 @@ TrainerGruntM16: closetext end -MapTeamRocketBaseB1FSignpost5Script: +TeamRocketBaseB1FSecurityCameraScript: jumptext SecurityCameraText -MapTeamRocketBaseB1FSignpost7Script: +TeamRocketBaseB1FRocketOathScript: jumpstd teamrocketoath -MapTeamRocketBaseB1FSignpost0Script: +TeamRocketBaseB1FSwitchScript: opentext checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS - iftrue UnknownScript_0x6cabe - writetext UnknownText_0x6cdad + iftrue .NoCameras + writetext TeamRocketBaseB1FSecretSwitchBetterPressText playsound SFX_TALLY waitbutton closetext @@ -522,8 +522,8 @@ MapTeamRocketBaseB1FSignpost0Script: setevent EVENT_SECURITY_CAMERA_5 end -UnknownScript_0x6cabe: - writetext UnknownText_0x6cdd0 +.NoCameras: + writetext TeamRocketBaseB1FSwitchIsOffText waitbutton closetext end @@ -714,12 +714,12 @@ SecurityCameraText: line "shiny." done -UnknownText_0x6cdad: +TeamRocketBaseB1FSecretSwitchBetterPressText: text "A secret switch!" line "Better press it." done -UnknownText_0x6cdd0: +TeamRocketBaseB1FSwitchIsOffText: text "The switch is" line "turned off." done @@ -770,14 +770,14 @@ TeamRocketBaseB1F_MapEvents: coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 db 9 ; bg events - bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script - bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script - bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script - bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script + bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSwitchScript + bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript + bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript + bg_event 8, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript + bg_event 22, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript + bg_event 24, 5, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript + bg_event 20, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript + bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive db 6 ; object events