diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 14:42:14 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 14:42:14 -0400 |
| commit | bf73772a560ddfdf0b404ba3f85eb26542031b7b (patch) | |
| tree | ee3cbc2fb2be1b2353ebd4c9887de2d69a91d2f2 /maps | |
| parent | 46ead9b8498fe7191735bd99f667dd1f9147f969 (diff) | |
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
Diffstat (limited to 'maps')
146 files changed, 610 insertions, 610 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 136d82da9..982ade9b4 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -34,7 +34,7 @@ BugsyScript: setflag ENGINE_HIVEBADGE checkcode VAR_BADGES scall AzaleaGymTriggerRockets -.FightDone +.FightDone: checkevent EVENT_GOT_TM49_FURY_CUTTER iftrue .GotFuryCutter setevent EVENT_BEAT_TWINS_AMY_AND_MAY @@ -63,10 +63,10 @@ AzaleaGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets TrainerTwinsAmyandmay1: @@ -134,7 +134,7 @@ AzaleaGymGuyScript: closetext end -.AzaleaGymGuyWinScript +.AzaleaGymGuyWinScript: opentext writetext AzaleaGymGuyWinText waitbutton @@ -145,7 +145,7 @@ AzaleaGymStatue: checkflag ENGINE_HIVEBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext BUGSY, 1, $1 jumpstd gymstatue2 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 7f4c16bea..93526a4a5 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -27,16 +27,16 @@ AzaleaTown_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .Flypoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.Trigger2 +.Trigger2: end -.Flypoint +.Flypoint: setflag ENGINE_FLYPOINT_AZALEA return @@ -216,7 +216,7 @@ WhiteApricornTree: AzaleaTownHiddenFullHeal: dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL - + AzaleaTownRivalBattleApproachMovement1: step_left diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 6c04dffe4..eeb4bf93b 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -15,10 +15,10 @@ BattleTowerOutside_MapScriptHeader: dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_OBJECTS, .Callback2 -.Callback1 +.Callback1: return -.Callback2 +.Callback2: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 8a6b134b4..cc9abdda9 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -20,17 +20,17 @@ BlackthornCity_MapScriptHeader: dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Santos -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN return -.Santos +.Santos: checkcode VAR_WEEKDAY if_equal SATURDAY, .SantosAppears disappear BLACKTHORNCITY_SANTOS return -.SantosAppears +.SantosAppears: appear BLACKTHORNCITY_SANTOS return @@ -101,7 +101,7 @@ SantosScript: writetext MeetSantosText buttonsound setevent EVENT_MET_SANTOS_OF_SATURDAY -.MetSantos +.MetSantos: writetext SantosGivesGiftText buttonsound verbosegiveitem SPELL_TAG @@ -112,14 +112,14 @@ SantosScript: closetext end -.Saturday +.Saturday: writetext SantosSaturdayText waitbutton -.Done +.Done: closetext end -.NotSaturday +.NotSaturday: writetext SantosNotSaturdayText waitbutton closetext diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 7f5b88c4a..b36e7ef67 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -15,7 +15,7 @@ BlackthornGym1F_MapScriptHeader: ; callbacks dbw MAPCALLBACK_TILES, .Boulders -.Boulders +.Boulders: checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 iffalse .skip1 changeblock $8, $2, $3b @@ -59,13 +59,13 @@ BlackthornGymClairScript: clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end -.FightDone +.FightDone: writetext ClairText_TooMuchToExpect waitbutton closetext end -.AlreadyGotBadge +.AlreadyGotBadge: checkevent EVENT_GOT_TM24_DRAGONBREATH iftrue .GotTM24 writetext BlackthornGymClairText_YouKeptMeWaiting @@ -137,7 +137,7 @@ BlackthornGymGuyScript: closetext end -.BlackthornGymGuyWinScript +.BlackthornGymGuyWinScript: writetext BlackthornGymGuyWinText waitbutton closetext @@ -147,7 +147,7 @@ BlackthornGymStatue: checkflag ENGINE_RISINGBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext CLAIR, 1, $1 jumpstd gymstatue2 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 02a4d2234..eeff34d3e 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -18,33 +18,33 @@ BlackthornGym2F_MapScriptHeader: ; callbacks dbw MAPCALLBACK_CMDQUEUE, .Boulders -.Boulders +.Boulders: writecmdqueue .BoulderCmdQueue return -.BoulderCmdQueue +.BoulderCmdQueue: dbw CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp dw 0 ; filler -.BoulderTable +.BoulderTable: stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 db -1 ; end -.Disappear4 +.Disappear4: disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall -.Disappear5 +.Disappear5: disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall -.Disappear6 +.Disappear6: disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall -.Fall +.Fall: pause 30 scall .FX opentext @@ -53,7 +53,7 @@ BlackthornGym2F_MapScriptHeader: closetext end -.FX +.FX: playsound SFX_STRENGTH earthquake 80 end diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 4833a18d5..c7049239b 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -16,22 +16,22 @@ BrunosRoom_MapScriptHeader: dbw MAPCALLBACK_TILES, .BrunosRoomDoors -.Trigger0 +.Trigger0: priorityjump UnknownScript_0x1809ad end -.Trigger1 +.Trigger1: end .BrunosRoomDoors: checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse .KeepDoorClosed changeblock $4, $e, $2a -.KeepDoorClosed +.KeepDoorClosed: checkevent EVENT_BRUNOS_ROOM_EXIT_OPEN iffalse .OpenDoor changeblock $4, $2, $16 -.OpenDoor +.OpenDoor: return UnknownScript_0x1809ad: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 67e79099b..b899ec3d7 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -35,11 +35,11 @@ BurnedTower1F_MapScriptHeader: checkevent EVENT_HOLE_IN_BURNED_TOWER iftrue .Next changeblock $a, $8, $32 ; hole -.Next +.Next: checkevent EVENT_RELEASED_THE_BEASTS iftrue .Done changeblock $6, $e, $9 ; ladder -.Done +.Done: return .EusineTrigger: @@ -137,11 +137,11 @@ BurnedTower1FRock: BurnedTower1FHiddenEther: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER - + BurnedTower1FHiddenUltraBall: dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - + BurnedTower1FHPUp: itemball HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 5de04e591..d607e7deb 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -34,7 +34,7 @@ BurnedTowerB1FLadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange changeblock $6, $e, $2 -.NoChange +.NoChange: return ReleaseTheBeasts: @@ -115,7 +115,7 @@ BurnedTowerB1FEusine: applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1 jump UnknownScript_0x18622a -.Movement +.Movement: applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2 UnknownScript_0x18622a: disappear BURNEDTOWERB1F_EUSINE diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 26e20308a..b64b76c2d 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -105,7 +105,7 @@ CeladonCafeTrashcan: setevent EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE end -.PackFull +.PackFull: opentext itemtotext LEFTOVERS, $0 writetext FoundLeftoversText @@ -115,7 +115,7 @@ CeladonCafeTrashcan: closetext end -.TrashEmpty +.TrashEmpty: jumpstd trashcan UnknownText_0x730de: diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index fc521d650..461b558ff 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -19,7 +19,7 @@ CeladonCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_CELADON return diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a673a2e11..a82e45f11 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -26,7 +26,7 @@ YoungsterScript_0x7117d: CeladonVendingMachine: opentext writetext CeladonVendingText -.Start +.Start: special PlaceMoneyTopRight loadmenudata .MenuData verticalmenu @@ -37,7 +37,7 @@ CeladonVendingMachine: closetext end -.FreshWater +.FreshWater: checkmoney $0, 200 if_equal $2, .NotEnoughMoney giveitem FRESH_WATER @@ -46,7 +46,7 @@ CeladonVendingMachine: itemtotext FRESH_WATER, $0 jump .VendItem -.SodaPop +.SodaPop: checkmoney $0, 300 if_equal $2, .NotEnoughMoney giveitem SODA_POP @@ -55,7 +55,7 @@ CeladonVendingMachine: itemtotext SODA_POP, $0 jump .VendItem -.Lemonade +.Lemonade: checkmoney $0, 350 if_equal $2, .NotEnoughMoney giveitem LEMONADE @@ -64,7 +64,7 @@ CeladonVendingMachine: itemtotext LEMONADE, $0 jump .VendItem -.VendItem +.VendItem: pause 10 playsound SFX_ENTER_DOOR writetext CeladonClangText @@ -72,24 +72,24 @@ CeladonVendingMachine: itemnotify jump .Start -.NotEnoughMoney +.NotEnoughMoney: writetext CeladonVendingNoMoneyText waitbutton jump .Start -.NotEnoughSpace +.NotEnoughSpace: writetext CeladonVendingNoSpaceText waitbutton jump .Start -.MenuData +.MenuData: db $40 ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db $80 ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index fd29c3b02..d763e6bc0 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -64,14 +64,14 @@ FisherScript_0x72144: scall .UnknownScript_0x72172 givecoins 18 setevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON -.UnknownScript_0x72169 +.UnknownScript_0x72169: writetext UnknownText_0x72345 waitbutton closetext spriteface LAST_TALKED, LEFT end -.UnknownScript_0x72172 +.UnknownScript_0x72172: jumpstd receiveitem end diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 8bedbffc4..411d109f7 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -35,7 +35,7 @@ ErikaScript_0x72a6a: playsound SFX_GET_BADGE waitsfx setflag ENGINE_RAINBOWBADGE -.FightDone +.FightDone: checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae writetext UnknownText_0x72cb0 @@ -108,7 +108,7 @@ CeladonGymStatue: checkflag ENGINE_RAINBOWBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext ERIKA, 1, $1 jumpstd gymstatue2 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 8deb8dc67..90f1e43c2 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -36,11 +36,11 @@ CeladonEusine: iftrue .HoOh writetext NoBeastsText waitbutton -.NoSuicune +.NoSuicune: closetext end -.HoOh +.HoOh: writetext EusineLeavesCeladonText waitbutton closetext @@ -49,15 +49,15 @@ CeladonEusine: applymovement CELADONPOKECENTER1F_EUSINE, .Movement1 jump .Continue -.Location1 +.Location1: applymovement CELADONPOKECENTER1F_EUSINE, .Movement2 -.Continue +.Continue: disappear CELADONPOKECENTER1F_EUSINE playsound SFX_EXIT_BUILDING waitsfx end -.Movement2 +.Movement2: step_left step_down step_down @@ -65,7 +65,7 @@ CeladonEusine: step_down step_end -.Movement1 +.Movement1: step_down step_down step_down diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 6d2720cbc..47afa867a 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -16,7 +16,7 @@ CeruleanCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN return diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index a5d826eba..ddadd6f9c 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -81,7 +81,7 @@ MistyScript_0x188432: playsound SFX_GET_BADGE waitsfx setflag ENGINE_CASCADEBADGE -.FightDone +.FightDone: writetext UnknownText_0x188782 waitbutton closetext @@ -130,7 +130,7 @@ CeruleanGymGuyScript: closetext end -.CeruleanGymGuyWinScript +.CeruleanGymGuyWinScript: writetext CeruleanGymGuyWinText waitbutton closetext @@ -138,7 +138,7 @@ CeruleanGymGuyScript: CeruleanGymHiddenMachinePart: dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART - + CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM @@ -162,7 +162,7 @@ CeruleanGymStatue: checkflag ENGINE_CASCADEBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext MISTY, 1, $1 jumpstd gymstatue2 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index bdf79238b..8abeb8c1b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -22,13 +22,13 @@ CharcoalKilnBoss: closetext end -.SavedSlowpoke +.SavedSlowpoke: writetext CharcoalKilnBossText2 waitbutton closetext end -.GotCut +.GotCut: writetext CharcoalKilnBossText3 waitbutton closetext @@ -46,7 +46,7 @@ CharcoalKilnApprentice: closetext end -.Thanks +.Thanks: writetext CharcoalKilnApprenticeText2 buttonsound verbosegiveitem CHARCOAL @@ -55,10 +55,10 @@ CharcoalKilnApprentice: closetext end -.YoureTheCoolest +.YoureTheCoolest: writetext CharcoalKilnApprenticeText3 waitbutton -.Done +.Done: closetext end diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index c123b74bf..39083c5ab 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -19,13 +19,13 @@ CherrygroveCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_CHERRYGROVE return @@ -36,7 +36,7 @@ CherrygroveCityGuideGent: yesorno iffalse .No jump .Yes -.Yes +.Yes: writetext GuideGentTourText1 waitbutton closetext @@ -91,14 +91,14 @@ CherrygroveCityGuideGent: waitsfx end -.JumpstdReceiveItem +.JumpstdReceiveItem: jumpstd receiveitem end .mapcardname db "MAP CARD@" -.No +.No: writetext GuideGentNoText waitbutton closetext diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 657e30bc7..512e4812f 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -26,13 +26,13 @@ CianwoodCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPointAndSuicune +.FlyPointAndSuicune: setflag ENGINE_FLYPOINT_CIANWOOD setevent EVENT_EUSINE_IN_BURNED_TOWER checkevent EVENT_FOUGHT_EUSINE @@ -83,7 +83,7 @@ UnknownScript_0x1a001e: special Special_FadeOutMusic playmapmusic pause 10 -.Done +.Done: end PokefanFScript_0x1a0084: diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index afeb908de..d20e3d4fa 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -51,7 +51,7 @@ ChuckScript_0x9d60f: setflag ENGINE_STORMBADGE checkcode VAR_BADGES scall CianwoodGymTriggerRockets -.FightDone +.FightDone: checkevent EVENT_GOT_TM01_DYNAMICPUNCH iftrue .AlreadyGotTM setevent EVENT_BEAT_BLACKBELT_YOSHI @@ -80,10 +80,10 @@ CianwoodGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets TrainerBlackbeltYoshi: @@ -137,7 +137,7 @@ CianwoodGymStatue: checkflag ENGINE_STORMBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext CHUCK, 1, $1 jumpstd gymstatue2 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index f488e8993..2a3f49c9d 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -34,7 +34,7 @@ CianwoodPharmacist: closetext end -.Mart +.Mart: pokemart MARTTYPE_PHARMACY, MART_CIANWOOD closetext end diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 3fe7c1ef8..7cd5818d5 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -27,7 +27,7 @@ CianwoodGymGuyScript: closetext end -.CianwoodGymGuyWinScript +.CianwoodGymGuyWinScript: opentext writetext CianwoodGymGuyWinText waitbutton diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index cc73856d2..62e79ad4f 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -11,7 +11,7 @@ CinnabarIsland_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_CINNABAR return diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 549861d7b..b307126c8 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -23,10 +23,10 @@ CopycatsHouse2FCallback: disappear COPYCATSHOUSE2F_COPYCAT2 appear COPYCATSHOUSE2F_COPYCAT1 jump .Done -.Part1 +.Part1: disappear COPYCATSHOUSE2F_COPYCAT1 appear COPYCATSHOUSE2F_COPYCAT2 -.Done +.Done: return Copycat: @@ -44,11 +44,11 @@ Copycat: variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part2 -.Part1 +.Part1: applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS -.Part2 +.Part2: special RunCallback_04 checkevent EVENT_RETURNED_MACHINE_PART iftrue .Part7 @@ -58,9 +58,9 @@ Copycat: writetext UnknownText_0x18afda jump .Part4 -.Part3 +.Part3: writetext UnknownText_0x18b316 -.Part4 +.Part4: waitbutton closetext checkflag ENGINE_PLAYER_IS_FEMALE @@ -68,9 +68,9 @@ Copycat: applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part6 -.Part5 +.Part5: applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 -.Part6 +.Part6: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 @@ -80,16 +80,16 @@ Copycat: closetext end -.Part7 +.Part7: opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part8 writetext UnknownText_0x18b064 jump .Part9 -.Part8 +.Part8: writetext UnknownText_0x18b366 -.Part9 +.Part9: waitbutton closetext checkflag ENGINE_PLAYER_IS_FEMALE @@ -97,9 +97,9 @@ Copycat: applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part11 -.Part10 +.Part10: applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 -.Part11 +.Part11: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 @@ -110,7 +110,7 @@ Copycat: setevent EVENT_MET_COPYCAT_FOUND_OUT_ABOUT_LOST_ITEM end -.Part12 +.Part12: opentext writetext UnknownText_0x18b17f buttonsound @@ -119,9 +119,9 @@ Copycat: clearevent EVENT_COPYCATS_HOUSE_2F_DOLL jump .Part14 -.Part13 +.Part13: opentext -.Part14 +.Part14: writetext UnknownText_0x18b1e2 buttonsound verbosegiveitem PASS @@ -132,7 +132,7 @@ Copycat: closetext end -.Part15 +.Part15: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part16 applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 @@ -140,11 +140,11 @@ Copycat: variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part17 -.Part16 +.Part16: applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 faceplayer variablesprite SPRITE_COPYCAT, SPRITE_KRIS -.Part17 +.Part17: special RunCallback_04 opentext checkflag ENGINE_PLAYER_IS_FEMALE @@ -152,9 +152,9 @@ Copycat: writetext UnknownText_0x18b298 jump .Part19 -.Part18 +.Part18: writetext UnknownText_0x18b415 -.Part19 +.Part19: waitbutton closetext checkflag ENGINE_PLAYER_IS_FEMALE @@ -162,16 +162,16 @@ Copycat: applymovement COPYCATSHOUSE2F_COPYCAT1, MovementData_0x18afd0 jump .Part21 -.Part20 +.Part20: applymovement COPYCATSHOUSE2F_COPYCAT2, MovementData_0x18afd0 -.Part21 +.Part21: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 opentext writetext UnknownText_0x18b2f5 waitbutton -.Part22 +.Part22: closetext end diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 615a98c94..b9c5c5380 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -32,7 +32,7 @@ DarkCaveVioletEntranceRock: DarkCaveVioletEntranceHiddenElixer: dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER - + DarkCaveVioletEntrance_MapEventHeader: ; filler diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 2f85c057d..88aa1e90b 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -13,7 +13,7 @@ PokefanMScript_0x74002: DiglettsCaveHiddenMaxRevive: dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE - + UnknownText_0x74008: text "A bunch of DIGLETT" diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 77faf9005..2a49c6993 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -23,7 +23,7 @@ AcademyEarl: writetext UnknownText_0x68bbd yesorno iffalse .Done -.Part1 +.Part1: writetext UnknownText_0x68c51 yesorno iffalse .Done @@ -32,7 +32,7 @@ AcademyEarl: closetext end -.Done +.Done: writetext UnknownText_0x68d31 waitbutton closetext @@ -65,7 +65,7 @@ YoungsterScript_0x68a9c: AcademyBlackboard: opentext writetext AcademyBlackboardText -.Loop +.Loop: loadmenudata .MenuHeader _2dmenu closewindow @@ -77,22 +77,22 @@ AcademyBlackboard: closetext end -.Poison +.Poison: writetext AcademyPoisonText waitbutton jump .Loop -.Paralysis +.Paralysis: writetext AcademyParalysisText waitbutton jump .Loop -.Sleep +.Sleep: writetext AcademySleepText waitbutton jump .Loop -.Burn +.Burn: writetext AcademyBurnText waitbutton jump .Loop @@ -102,21 +102,21 @@ AcademyBlackboard: waitbutton jump .Loop -.MenuHeader +.MenuHeader: db $40 ; flags db 00, 00 ; start coords db 08, 11 ; end coords dw .Data db 1 ; default option -.Data +.Data: db $80 ; flags dn 3, 2 ; rows, columns db 5 ; spacing dba .Text dbw BANK(AcademyBlackboard), 0 -.Text +.Text: db "PSN@" db "PAR@" db "SLP@" @@ -137,7 +137,7 @@ AcademyNotebook: iffalse .Done writetext AcademyNotebookText3 waitbutton -.Done +.Done: closetext end diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b0b3c8ab8..b15850d2e 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -17,7 +17,7 @@ EcruteakCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK return diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 43193217c..7be7c7eeb 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -48,7 +48,7 @@ MortyScript_0x99d58: domaptrigger ECRUTEAK_HOUSE, $1 setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_2 -.FightDone +.FightDone: checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 setevent EVENT_BEAT_SAGE_JEFFREY @@ -77,10 +77,10 @@ EcruteakGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets UnknownScript_0x99dc6: @@ -153,7 +153,7 @@ EcruteakGymGuyScript: closetext end -.EcruteakGymGuyWinScript +.EcruteakGymGuyWinScript: writetext EcruteakGymGuyWinText waitbutton closetext @@ -163,7 +163,7 @@ EcruteakGymStatue: checkflag ENGINE_FOGBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext MORTY, 1, $1 jumpstd gymstatue2 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 841e27079..d595e83e2 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -45,7 +45,7 @@ EcruteakPokeCenter1F_MapScriptHeader: buttonsound jump .PointlessJump -.PointlessJump +.PointlessJump: writetext EcruteakPokeCenter1F_BillText2 waitbutton closetext diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 2747f6a24..b939a2fb6 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -305,7 +305,7 @@ ElmsLabHealingMachine: closetext end -.CanHeal +.CanHeal: writetext ElmsLabHealingMachineText2 yesorno iftrue ElmsLabHealingMachine_HealParty @@ -578,13 +578,13 @@ ElmsLabWindow: iftrue .BreakIn jump .Normal -.BreakIn +.BreakIn: writetext ElmsLabWindowText2 waitbutton closetext end -.Normal +.Normal: writetext ElmsLabWindowText1 waitbutton closetext diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index dddc192cd..f53fec56c 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -56,7 +56,7 @@ SailorScript_0x75160: closetext end -.Olivine +.Olivine: writetext UnknownText_0x7529b waitbutton closetext diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 898fd20a0..62215bd3d 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -14,7 +14,7 @@ FuchsiaCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA return diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 48a5d2684..2f91b85f0 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -42,7 +42,7 @@ JanineScript_0x195db9: waitsfx setflag ENGINE_SOULBADGE jump UnknownScript_0x195e02 -.FightDone +.FightDone: faceplayer opentext UnknownScript_0x195e02: @@ -205,7 +205,7 @@ FuchsiaGymGuyScript: closetext end -.FuchsiaGymGuyWinScript +.FuchsiaGymGuyWinScript: writetext FuchsiaGymGuyWinText waitbutton closetext @@ -215,7 +215,7 @@ FuchsiaGymStatue: checkflag ENGINE_SOULBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext JANINE, 1, $1 jumpstd gymstatue2 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index cf01ef68c..0054647c3 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -26,16 +26,16 @@ GoldenrodCity_MapScriptHeader: dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria dbw MAPCALLBACK_OBJECTS, .MoveTutor -.FlyPointAndFloria +.FlyPointAndFloria: setflag ENGINE_FLYPOINT_GOLDENROD setflag ENGINE_FLORIA checkevent EVENT_MET_FLORIA iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO -.FloriaDone +.FloriaDone: return -.MoveTutor +.MoveTutor: checkevent EVENT_BEAT_ELITE_FOUR iffalse .MoveTutorDone checkitem COIN_CASE @@ -43,15 +43,15 @@ GoldenrodCity_MapScriptHeader: checkcode VAR_WEEKDAY if_equal WEDNESDAY, .MoveTutorAppear if_equal SATURDAY, .MoveTutorAppear -.MoveTutorDisappear +.MoveTutorDisappear: disappear GOLDENRODCITY_POKEFAN_M2 return -.MoveTutorAppear +.MoveTutorAppear: checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone appear GOLDENRODCITY_POKEFAN_M2 -.MoveTutorDone +.MoveTutorDone: return MoveTutor: diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 3d54a45b0..10e233381 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStore6F_MapScriptHeader: GoldenrodVendingMachine: opentext writetext GoldenrodVendingText -.Start +.Start: special PlaceMoneyTopRight loadmenudata .MenuData verticalmenu @@ -23,7 +23,7 @@ GoldenrodVendingMachine: closetext end -.FreshWater +.FreshWater: checkmoney $0, 200 if_equal $2, .NotEnoughMoney giveitem FRESH_WATER @@ -32,7 +32,7 @@ GoldenrodVendingMachine: itemtotext FRESH_WATER, $0 jump .VendItem -.SodaPop +.SodaPop: checkmoney $0, 300 if_equal $2, .NotEnoughMoney giveitem SODA_POP @@ -41,7 +41,7 @@ GoldenrodVendingMachine: itemtotext SODA_POP, $0 jump .VendItem -.Lemonade +.Lemonade: checkmoney $0, 350 if_equal $2, .NotEnoughMoney giveitem LEMONADE @@ -50,7 +50,7 @@ GoldenrodVendingMachine: itemtotext LEMONADE, $0 jump .VendItem -.VendItem +.VendItem: pause 10 playsound SFX_ENTER_DOOR writetext GoldenrodClangText @@ -58,24 +58,24 @@ GoldenrodVendingMachine: itemnotify jump .Start -.NotEnoughMoney +.NotEnoughMoney: writetext GoldenrodVendingNoMoneyText waitbutton jump .Start -.NotEnoughSpace +.NotEnoughSpace: writetext GoldenrodVendingNoSpaceText waitbutton jump .Start -.MenuData +.MenuData: db $40 ; flags db 02, 00 ; start coords db 11, 19 ; end coords dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db $80 ; flags db 4 ; items db "FRESH WATER ¥200@" diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index e8489bbb5..769c01fb8 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -38,11 +38,11 @@ UnknownScript_0x7d791: changeblock $a, $8, $d return -.Layout2 +.Layout2: changeblock $4, $a, $d return -.Layout3 +.Layout3: changeblock $a, $c, $d return diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 9711eaf4a..2a3e2434e 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -22,25 +22,25 @@ MapGoldenrodDeptStoreElevatorSignpost0Script: iftrue .BoxLayout2 checkevent EVENT_WAREHOUSE_LAYOUT_3 iftrue .BoxLayout3 -.BoxLayout3 +.BoxLayout3: setevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 end -.BoxLayout1 +.BoxLayout1: clearevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_WAREHOUSE_LAYOUT_2 clearevent EVENT_WAREHOUSE_LAYOUT_3 end -.BoxLayout2 +.BoxLayout2: clearevent EVENT_WAREHOUSE_LAYOUT_1 clearevent EVENT_WAREHOUSE_LAYOUT_2 setevent EVENT_WAREHOUSE_LAYOUT_3 end -.Done +.Done: end diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ec85ea6eb..ed88df5a5 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -23,7 +23,7 @@ GoldenrodGameCorner_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .Callback -.Callback +.Callback: checkevent EVENT_BEAT_ELITE_FOUR iffalse .finish checkitem COIN_CASE @@ -149,7 +149,7 @@ GoldenrodGameCornerTMVendorMenuData: dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db $80 ; flags db 4 ; items db "TM25 5500@" diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 5704b54a9..95d4693b5 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -42,7 +42,7 @@ WhitneyScript_0x5400c: setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE setevent EVENT_BEAT_LASS_BRIDGET -.FightDone +.FightDone: opentext checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying @@ -51,7 +51,7 @@ WhitneyScript_0x5400c: closetext end -.StoppedCrying +.StoppedCrying: checkevent EVENT_GOT_TM45_ATTRACT iftrue UnknownScript_0x54077 checkflag ENGINE_PLAINBADGE @@ -88,10 +88,10 @@ GoldenrodGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets TrainerLassCarrie: @@ -161,7 +161,7 @@ GoldenrodGymGuyScript: closetext end -.GoldenrodGymGuyWinScript +.GoldenrodGymGuyWinScript: opentext writetext GoldenrodGymGuyWinText waitbutton @@ -172,7 +172,7 @@ GoldenrodGymStatue: checkflag ENGINE_PLAINBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext WHITNEY, 1, $1 jumpstd gymstatue2 diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 12d5dbdcb..135c70164 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -13,7 +13,7 @@ IcePathB2FBlackthornSideTMRest: IcePathB2FBlackthornSideHiddenIceHeal: dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL - + IcePathB2FBlackthornSide_MapEventHeader: ; filler diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index f17f21d12..a588441bd 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -24,7 +24,7 @@ IcePathB2FMahoganySideMaxPotion: IcePathB2FMahoganySideHiddenCarbos: dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS - + UnknownText_0x7e5ad: text "It's immovably" diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index ef8043ec1..7ac703e3f 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -418,11 +418,11 @@ IlexForestEther: IlexForestHiddenEther: dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER - + IlexForestHiddenSuperPotion: dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION - + IlexForestHiddenFullHeal: dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index ce217afde..348828ea2 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -108,7 +108,7 @@ PlateauRivalBattleCommon: reloadmapafterbattle jump PlateauRivalPostBattle -.Totodile +.Totodile: winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 4 @@ -117,7 +117,7 @@ PlateauRivalBattleCommon: reloadmapafterbattle jump PlateauRivalPostBattle -.Chikorita +.Chikorita: winlosstext PlateauRivalWinText, PlateauRivalLoseText setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER loadtrainer RIVAL2, 5 @@ -168,7 +168,7 @@ TeleportGuyScript: warp NEW_BARK_TOWN, $d, $6 end -.No +.No: writetext TeleportGuyNoText waitbutton closetext diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 5a8500989..88639d8d7 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -164,22 +164,22 @@ NeighborScript: checknite iftrue .NiteScript -.MornScript +.MornScript: writetext NeighborMornIntroText buttonsound jump .Main -.DayScript +.DayScript: writetext NeighborDayIntroText buttonsound jump .Main -.NiteScript +.NiteScript: writetext NeighborNiteIntroText buttonsound jump .Main -.Main +.Main: writetext NeighborText waitbutton closetext diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index a66ed5948..f847f6fa0 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -53,7 +53,7 @@ GameConsole: KrissHousePoster: dw EVENT_KRISS_ROOM_POSTER, .Script -.Script +.Script: describedecoration 0 KrissHouseRadio: @@ -76,10 +76,10 @@ KrissHouseRadio: setevent EVENT_LISTENED_TO_INITIAL_RADIO end -.NormalRadio +.NormalRadio: jumpstd radio1 -.AbbreviatedRadio +.AbbreviatedRadio: opentext writetext KrisRadioText4 pause 45 @@ -95,7 +95,7 @@ KrissHousePC: iftrue .Warp closetext end -.Warp +.Warp: warp NONE, $0, $0 end diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 54783779b..70fc3794e 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -37,9 +37,9 @@ KrissNeighborsHouseRadio: closetext setevent EVENT_LISTENED_TO_INITIAL_RADIO end -.NormalRadio +.NormalRadio: jumpstd radio1 -.AbbreviatedRadio +.AbbreviatedRadio: opentext writetext KrisNeighborRadioText4 pause 45 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index f3dd687bd..4d20200cd 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -368,21 +368,21 @@ KurtsGranddaughter1: closetext end -.SlowpokeBack +.SlowpokeBack: opentext writetext KurtsGranddaughterSlowpokeBackText waitbutton closetext end -.Lonely +.Lonely: opentext writetext KurtsGranddaughterLonelyText waitbutton closetext end -.Dad +.Dad: opentext writetext KurtsGranddaughterDadText waitbutton @@ -401,7 +401,7 @@ KurtsGranddaughter2Subscript: spriteface KURTSHOUSE_TWIN2, RIGHT end -.GSBall +.GSBall: writetext KurtsGranddaughterGSBallText waitbutton closetext diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 4466689f5..6f2a356b6 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -28,23 +28,23 @@ LakeofRage_MapScriptHeader: dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Wesley -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_LAKE_OF_RAGE return -.Wesley +.Wesley: checkcode VAR_WEEKDAY if_equal WEDNESDAY, .WesleyAppears disappear LAKEOFRAGE_WESLEY return -.WesleyAppears +.WesleyAppears: appear LAKEOFRAGE_WESLEY return @@ -206,7 +206,7 @@ WesleyScript: writetext MeetWesleyText buttonsound setevent EVENT_MET_WESLEY_OF_WEDNESDAY -.MetWesley +.MetWesley: writetext WesleyGivesGiftText buttonsound verbosegiveitem BLACKBELT @@ -238,15 +238,15 @@ LakeofRageTMDetect: LakeofRageHiddenFullRestore: dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE - + LakeofRageHiddenRareCandy: dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY - + LakeofRageHiddenMaxPotion: dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION - + MovementData_0x70155: teleport_from diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 2abb1e1ff..74e3b3062 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -22,10 +22,10 @@ HiddenPowerGuy: waitbutton closetext end -.AlreadyGotItem +.AlreadyGotItem: writetext HiddenPowerGuyText3 waitbutton -.Done +.Done: closetext end diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index e1f967d10..0669cf956 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -39,13 +39,13 @@ GentlemanScript_0x7ee6c: stringtotext .expncardname, $1 scall .UnknownScript_0x7ee94 setflag ENGINE_EXPN_CARD -.UnknownScript_0x7ee8e +.UnknownScript_0x7ee8e: writetext UnknownText_0x7f141 waitbutton closetext end -.UnknownScript_0x7ee94 +.UnknownScript_0x7ee94: jumpstd receiveitem end diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index fe5e393bd..45f235d76 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -14,7 +14,7 @@ LavenderTown_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER return diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index ac52fa203..c30e647e6 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -34,7 +34,7 @@ PryceScript_0x199a9e: setflag ENGINE_GLACIERBADGE checkcode VAR_BADGES scall MahoganyGymTriggerRockets -.FightDone +.FightDone: checkevent EVENT_GOT_TM16_ICY_WIND iftrue UnknownScript_0x199af0 setevent EVENT_BEAT_SKIER_ROXANNE @@ -64,10 +64,10 @@ MahoganyGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets TrainerSkierRoxanne: @@ -135,7 +135,7 @@ MahoganyGymGuyScript: closetext end -.MahoganyGymGuyWinScript +.MahoganyGymGuyWinScript: writetext MahoganyGymGuyWinText waitbutton closetext @@ -145,7 +145,7 @@ MahoganyGymStatue: checkflag ENGINE_GLACIERBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext PRYCE, 1, $1 jumpstd gymstatue2 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 5b282e0b3..b632fe50e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -18,13 +18,13 @@ MahoganyTown_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_MAHOGANY return diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index a12d21903..7c974e21d 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -23,7 +23,7 @@ UnknownScript_0x77092: end UnknownScript_0x77093: - setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE + setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE return UnknownScript_0x77097: @@ -82,7 +82,7 @@ ClefairyDance: MountMoonSquareHiddenMoonStone: dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE - + DontLitterSign: jumptext DontLitterSignText diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a9d25bb7b..18abb2152 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -65,7 +65,7 @@ MountMortar1FInsideUltraBall: MountMortar1FInsideHiddenMaxRepel: dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL - + PokemaniacMillerSeenText: text "I'm not losing" diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index ebaa40bf1..069874d8f 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -17,7 +17,7 @@ MountMortar1FOutsideRevive: MountMortar1FOutsideHiddenHyperPotion: dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION - + MountMortar1FOutside_MapEventHeader: ; filler diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 6d08a7d22..f76300a68 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -45,7 +45,7 @@ MountMortar2FInsideEscapeRope: MountMortar2FInsideHiddenFullRestore: dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE - + SupernerdHughSeenText: text "Yo! MARKUS!" diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index e523f5fcd..06ebd10cc 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -73,7 +73,7 @@ MountMortarB1FPPUp: MountMortarB1FHiddenMaxRevive: dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE - + UnknownText_0x7e24d: text "Hey!" diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 5f1af90e7..4d06e3516 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,24 +3,24 @@ const_value set 2 const MRPOKEMONSHOUSE_OAK MrPokemonsHouse_MapScriptHeader: -.MapTriggers +.MapTriggers: db 2 ; triggers maptrigger .Trigger0 maptrigger .Trigger1 -.MapCallbacks +.MapCallbacks: db 0 -.Trigger0 +.Trigger0: priorityjump .MrPokemonEvent end -.Trigger1 +.Trigger1: end -.MrPokemonEvent +.MrPokemonEvent: showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN opentext @@ -63,13 +63,13 @@ MrPokemonsHouse_MrPokemonScript: closetext end -.AlwaysNewDiscoveries +.AlwaysNewDiscoveries: writetext MrPokemonText_AlwaysNewDiscoveries waitbutton closetext end -.RedScale +.RedScale: writetext MrPokemonText_GimmeTheScale yesorno iffalse .refused @@ -139,11 +139,11 @@ MrPokemonsHouse_OakScript: setevent EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB end -.RivalTakesChikorita +.RivalTakesChikorita: setevent EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB end -.RivalTakesCyndaquil +.RivalTakesCyndaquil: setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB end diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 04deea556..04b570bdf 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -18,10 +18,10 @@ MrPsychic: verbosegiveitem TM_PSYCHIC iffalse .Done setevent EVENT_GOT_TM29_PSYCHIC -.AlreadyGotItem +.AlreadyGotItem: writetext MrPsychicText2 waitbutton -.Done +.Done: closetext end diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index b2d132bde..1babc73a2 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -109,19 +109,19 @@ UnknownScript_0x5c088: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer SCHOOLBOY, JACK1 startbattle reloadmapafterbattle @@ -129,7 +129,7 @@ UnknownScript_0x5c088: clearflag ENGINE_JACK end -.LoadFight1 +.LoadFight1: loadtrainer SCHOOLBOY, JACK2 startbattle reloadmapafterbattle @@ -137,7 +137,7 @@ UnknownScript_0x5c088: clearflag ENGINE_JACK end -.LoadFight2 +.LoadFight2: loadtrainer SCHOOLBOY, JACK3 startbattle reloadmapafterbattle @@ -145,7 +145,7 @@ UnknownScript_0x5c088: clearflag ENGINE_JACK end -.LoadFight3 +.LoadFight3: loadtrainer SCHOOLBOY, JACK4 startbattle reloadmapafterbattle @@ -153,7 +153,7 @@ UnknownScript_0x5c088: clearflag ENGINE_JACK end -.LoadFight4 +.LoadFight4: loadtrainer SCHOOLBOY, JACK5 startbattle reloadmapafterbattle @@ -306,7 +306,7 @@ NationalParkTMDig: NationalParkHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - + UnknownText_0x5c1d3: text "Look! Check out my" diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 113fd6f96..eccc3295c 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -116,7 +116,7 @@ NationalParkBugContestTMDig: NationalParkBugContestHiddenFullHeal: dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL - + UnknownText_0x5c94c: text "DON: I'm going to" diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 77ab78bc7..e83139fe7 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -17,13 +17,13 @@ NewBarkTown_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_NEW_BARK clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM return diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 55aa4f72c..9162692a6 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -24,13 +24,13 @@ Oak: writetext OakWelcomeKantoText buttonsound setevent EVENT_TALKED_TO_OAK_IN_KANTO -.CheckBadges +.CheckBadges: checkcode VAR_BADGES if_equal 16, .OpenMtSilver if_equal 8, .Complain jump .AhGood -.CheckPokedex +.CheckPokedex: writetext OakLabDexCheckText waitbutton special ProfOaksPCBoot @@ -39,18 +39,18 @@ Oak: closetext end -.OpenMtSilver +.OpenMtSilver: writetext OakOpenMtSilverText buttonsound setevent EVENT_OPENED_MT_SILVER jump .CheckPokedex -.Complain +.Complain: writetext OakNoKantoBadgesText buttonsound jump .CheckPokedex -.AhGood +.AhGood: writetext OakYesKantoBadgesText buttonsound jump .CheckPokedex diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 1546f647e..6a05af16c 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -18,13 +18,13 @@ OlivineCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_OLIVINE return diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 51b9bd86c..59b20b95e 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -25,13 +25,13 @@ GoodRodGuru: setevent EVENT_GOT_GOOD_ROD end -.DontWantIt +.DontWantIt: writetext DontWantGoodRodText waitbutton closetext end -.AlreadyGotItem +.AlreadyGotItem: writetext HaveGoodRodText waitbutton closetext diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index bece5068c..c8cf77196 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -29,7 +29,7 @@ JasmineScript_0x9c12f: setflag ENGINE_MINERALBADGE checkcode VAR_BADGES scall OlivineGymTriggerRockets -.FightDone +.FightDone: checkevent EVENT_GOT_TM23_IRON_TAIL iftrue UnknownScript_0x9c172 writetext UnknownText_0x9c354 @@ -54,10 +54,10 @@ OlivineGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets OlivineGymGuyScript: @@ -72,14 +72,14 @@ OlivineGymGuyScript: closetext end -.OlivineGymGuyWinScript +.OlivineGymGuyWinScript: opentext writetext OlivineGymGuyWinText waitbutton closetext end -.OlivineGymGuyPreScript +.OlivineGymGuyPreScript: opentext writetext OlivineGymGuyPreText waitbutton @@ -90,7 +90,7 @@ OlivineGymStatue: checkflag ENGINE_MINERALBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext JASMINE, 1, $1 jumpstd gymstatue2 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 06b8a04ea..9afec908a 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -55,16 +55,16 @@ UnknownScript_0x5afc7: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight3 +.Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer SAILOR, HUEY1 startbattle reloadmapafterbattle @@ -72,7 +72,7 @@ UnknownScript_0x5afc7: clearflag ENGINE_HUEY end -.LoadFight1 +.LoadFight1: loadtrainer SAILOR, HUEY2 startbattle reloadmapafterbattle @@ -80,7 +80,7 @@ UnknownScript_0x5afc7: clearflag ENGINE_HUEY end -.LoadFight2 +.LoadFight2: loadtrainer SAILOR, HUEY3 startbattle reloadmapafterbattle @@ -88,7 +88,7 @@ UnknownScript_0x5afc7: clearflag ENGINE_HUEY end -.LoadFight3 +.LoadFight3: loadtrainer SAILOR, HUEY4 startbattle reloadmapafterbattle diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index cbc8bc441..7b8b334c9 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -45,7 +45,7 @@ OlivineLighthouse5FTMSwagger: OlivineLighthouse5FHiddenHyperPotion: dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION - + SailorErnestSeenText: text "I wanted to battle" diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 734d72dbb..e985ac45f 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -237,7 +237,7 @@ CooltrainerFScript_0x74a22: OlivinePortHiddenProtein: dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN - + MovementData_0x74a30: step_down diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 900a4bf20..45ab0c5ca 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -12,7 +12,7 @@ PalletTown_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_PALLET return diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 9d60b3a2e..e70012447 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -15,7 +15,7 @@ PewterCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_PEWTER return diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 8fce69b13..3adc06019 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -34,7 +34,7 @@ BrockScript_0x1a2864: closetext end -.FightDone +.FightDone: writetext UnknownText_0x1a2ada waitbutton closetext @@ -61,7 +61,7 @@ PewterGymGuyScript: closetext end -.PewterGymGuyWinScript +.PewterGymGuyWinScript: writetext PewterGymGuyWinText waitbutton closetext @@ -71,7 +71,7 @@ PewterGymStatue: checkflag ENGINE_BOULDERBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext BROCK, 1, $1 jumpstd gymstatue2 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a15cefda5..a1ca4cf64 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -62,13 +62,13 @@ GentlemanScript_0x5cd3d: if_equal 3, .ThirdPlace jump .NoPrize -.GameOver +.GameOver: writetext UnknownText_0x5cf7e waitbutton closetext end -.FirstPlace +.FirstPlace: writetext UnknownText_0x5cfb5 playsound SFX_1ST_PLACE waitsfx @@ -79,7 +79,7 @@ GentlemanScript_0x5cd3d: setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver -.SecondPlace +.SecondPlace: writetext UnknownText_0x5d023 playsound SFX_2ND_PLACE waitsfx @@ -90,7 +90,7 @@ GentlemanScript_0x5cd3d: setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver -.ThirdPlace +.ThirdPlace: writetext UnknownText_0x5d076 playsound SFX_3RD_PLACE waitsfx @@ -101,7 +101,7 @@ GentlemanScript_0x5cd3d: setflag ENGINE_LUCKY_NUMBER_SHOW jump .GameOver -.NoPrize +.NoPrize: writetext UnknownText_0x5d0c0 waitbutton closetext diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 8145530a8..63b37abed 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -34,7 +34,7 @@ TeacherScript_0x5d701: closetext end -.Rockets +.Rockets: writetext UnknownText_0x5d983 waitbutton closetext diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 928f44cd4..5fe5e65a4 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -23,7 +23,7 @@ CardKeyShutterCallback: iftrue .Change return -.Change +.Change: changeblock $e, $2, $2a changeblock $e, $4, $1 return diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index a7e4af0e6..ae909f6da 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -11,7 +11,7 @@ RedsHouse1F_MapScriptHeader: .MapCallbacks: db 0 -.Trigger +.Trigger: end RedsMom: @@ -24,7 +24,7 @@ RedsMom: closetext setevent EVENT_MET_REDS_MOM end -.MetAlready +.MetAlready: writetext RedsMomText2 waitbutton closetext diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 14156a01f..1fa6ef971 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -17,11 +17,11 @@ RockTunnel1FTMSteelWing: RockTunnel1FHiddenXAccuracy: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY - + RockTunnel1FHiddenXDefend: dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND - + RockTunnel1F_MapEventHeader: ; filler diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 7d061d45d..391083470 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -21,7 +21,7 @@ RockTunnelB1FRevive: RockTunnelB1FHiddenMaxPotion: dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION - + RockTunnelB1F_MapEventHeader: ; filler diff --git a/maps/Route11.asm b/maps/Route11.asm index 73e10a917..05b19d424 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -64,7 +64,7 @@ FruitTreeScript_0x68055: Route11HiddenRevive: dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE - + YoungsterOwenSeenText: text "There's no cheat-" diff --git a/maps/Route12.asm b/maps/Route12.asm index bffdf1bdc..2a1e078f5 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -71,7 +71,7 @@ Route12Nugget: Route12HiddenElixer: dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER - + FisherMartinSeenText: text "Patience is the" diff --git a/maps/Route13.asm b/maps/Route13.asm index 75c90ee10..79e035aa6 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -78,7 +78,7 @@ Route13DirectionsSign: Route13HiddenCalcium: dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM - + PokefanmAlexSeenText: text "Bow down before my" diff --git a/maps/Route17.asm b/maps/Route17.asm index 7969259cc..b01ce1ddc 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -66,11 +66,11 @@ BikerGlennScript: Route17HiddenMaxEther: dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER - + Route17HiddenMaxElixer: dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER - + BikerRileySeenText: text "Hey, you! You're" diff --git a/maps/Route19.asm b/maps/Route19.asm index d0326b791..d414459a0 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -17,7 +17,7 @@ Route19_MapScriptHeader: dbw MAPCALLBACK_TILES, .ClearRocks -.ClearRocks +.ClearRocks: checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .Done changeblock $6, $6, $7a @@ -26,7 +26,7 @@ Route19_MapScriptHeader: changeblock $c, $8, $7a changeblock $4, $8, $7a changeblock $a, $a, $7a -.Done +.Done: return TrainerSwimmerfDawn: @@ -99,7 +99,7 @@ FisherScript_0x19ea61: closetext end -.RocksCleared +.RocksCleared: writetext Route19FisherText2 waitbutton closetext diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index a958c7af4..fcdbc9be1 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -18,7 +18,7 @@ OfficerScript_0x1ab3f6: closetext end -.RocksCleared +.RocksCleared: writetext UnknownText_0x1ab48a waitbutton closetext diff --git a/maps/Route20.asm b/maps/Route20.asm index 4dc45c98c..3355026dd 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -14,7 +14,7 @@ Route20_MapScriptHeader: dbw MAPCALLBACK_NEWMAP, .ClearRocks -.ClearRocks +.ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED return diff --git a/maps/Route23.asm b/maps/Route23.asm index 2861f0f6a..a8bd39b5e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -8,7 +8,7 @@ Route23_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU return diff --git a/maps/Route25.asm b/maps/Route25.asm index 016cd84a6..5fb6d3166 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -194,7 +194,7 @@ Route25Protein: Route25HiddenPotion: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION - + MovementData_0x19efe8: big_step_down diff --git a/maps/Route26.asm b/maps/Route26.asm index 54e4befdc..ccc32ed63 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -62,13 +62,13 @@ UnknownScript_0x1a4d79: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer COOLTRAINERM, GAVEN3 startbattle reloadmapafterbattle @@ -76,7 +76,7 @@ UnknownScript_0x1a4d79: clearflag ENGINE_GAVEN end -.LoadFight1 +.LoadFight1: loadtrainer COOLTRAINERM, GAVEN1 startbattle reloadmapafterbattle @@ -84,7 +84,7 @@ UnknownScript_0x1a4d79: clearflag ENGINE_GAVEN end -.LoadFight2 +.LoadFight2: loadtrainer COOLTRAINERM, GAVEN2 startbattle reloadmapafterbattle @@ -166,13 +166,13 @@ UnknownScript_0x1a4e35: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer COOLTRAINERF, BETH1 startbattle reloadmapafterbattle @@ -180,7 +180,7 @@ UnknownScript_0x1a4e35: clearflag ENGINE_BETH end -.LoadFight1 +.LoadFight1: loadtrainer COOLTRAINERF, BETH2 startbattle reloadmapafterbattle @@ -188,7 +188,7 @@ UnknownScript_0x1a4e35: clearflag ENGINE_BETH end -.LoadFight2 +.LoadFight2: loadtrainer COOLTRAINERF, BETH3 startbattle reloadmapafterbattle diff --git a/maps/Route27.asm b/maps/Route27.asm index e3cad6a22..0f291364d 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -99,13 +99,13 @@ UnknownScript_0x1a08ff: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer BIRD_KEEPER, JOSE2 startbattle reloadmapafterbattle @@ -113,7 +113,7 @@ UnknownScript_0x1a08ff: clearflag ENGINE_JOSE end -.LoadFight1 +.LoadFight1: loadtrainer BIRD_KEEPER, JOSE1 startbattle reloadmapafterbattle @@ -121,7 +121,7 @@ UnknownScript_0x1a08ff: clearflag ENGINE_JOSE end -.LoadFight2 +.LoadFight2: loadtrainer BIRD_KEEPER, JOSE3 startbattle reloadmapafterbattle @@ -232,13 +232,13 @@ UnknownScript_0x1a09e9: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer COOLTRAINERF, REENA1 startbattle reloadmapafterbattle @@ -246,7 +246,7 @@ UnknownScript_0x1a09e9: clearflag ENGINE_REENA end -.LoadFight1 +.LoadFight1: loadtrainer COOLTRAINERF, REENA2 startbattle reloadmapafterbattle @@ -254,7 +254,7 @@ UnknownScript_0x1a09e9: clearflag ENGINE_REENA end -.LoadFight2 +.LoadFight2: loadtrainer COOLTRAINERF, REENA3 startbattle reloadmapafterbattle diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index b00862edd..1a7d77dee 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -19,20 +19,20 @@ SandstormHouseWoman: if_greater_than $95, .Loyal jump .Disloyal -.Loyal +.Loyal: writetext SandstormHouseWomanLoyalText buttonsound verbosegiveitem TM_SANDSTORM iffalse .Done setevent EVENT_GOT_TM37_SANDSTORM -.AlreadyGotItem +.AlreadyGotItem: writetext SandstormHouseSandstormDescription waitbutton -.Done +.Done: closetext end -.Disloyal +.Disloyal: writetext SandstormHouseWomanDisloyalText waitbutton closetext diff --git a/maps/Route28.asm b/maps/Route28.asm index cb04252bb..6923947fb 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -10,7 +10,7 @@ Route28Sign: Route28HiddenRareCandy: dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY - + Route28SignText: text "ROUTE 28" diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 624fcbfcc..0e0f95f01 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -12,7 +12,7 @@ Route28FamousSpeechHouse_MapScriptHeader: .MapCallbacks: db 0 -.Trigger +.Trigger: end Celebrity: @@ -25,10 +25,10 @@ Celebrity: verbosegiveitem TM_STEEL_WING iffalse .Done setevent EVENT_GOT_TM47_STEEL_WING -.Done +.Done: closetext end -.AlreadyGotItem +.AlreadyGotItem: writetext CelebrityText2 waitbutton closetext diff --git a/maps/Route29.asm b/maps/Route29.asm index 5c9d020c8..b30675f4f 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -33,11 +33,11 @@ Route29_MapScriptHeader: checkflag ENGINE_ZEPHYRBADGE iftrue .DoesTuscanyAppear -.TuscanyDisappears +.TuscanyDisappears: disappear ROUTE29_TUSCANY return -.DoesTuscanyAppear +.DoesTuscanyAppear: checkcode VAR_WEEKDAY if_not_equal TUESDAY, .TuscanyDisappears appear ROUTE29_TUSCANY @@ -183,7 +183,7 @@ TuscanyScript: writetext MeetTuscanyText buttonsound setevent EVENT_MET_TUSCANY_OF_TUESDAY -.MetTuscany +.MetTuscany: writetext TuscanyGivesGiftText buttonsound verbosegiveitem PINK_BOW diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 3a269d536..2c37f8ff6 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -18,10 +18,10 @@ FisherScript_0x9b847: verbosegiveitem NUGGET iffalse .Done setevent EVENT_GOT_NUGGET_FROM_GUY -.GotItem +.GotItem: writetext UnknownText_0x9b8e5 waitbutton -.Done +.Done: closetext end diff --git a/maps/Route30.asm b/maps/Route30.asm index 317c01ea3..bd669fd6a 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -76,19 +76,19 @@ TrainerYoungsterJoey: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_GOLDENROD iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer YOUNGSTER, JOEY1 startbattle reloadmapafterbattle @@ -96,7 +96,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight1 +.LoadFight1: loadtrainer YOUNGSTER, JOEY2 startbattle reloadmapafterbattle @@ -104,7 +104,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight2 +.LoadFight2: loadtrainer YOUNGSTER, JOEY3 startbattle reloadmapafterbattle @@ -112,7 +112,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight3 +.LoadFight3: loadtrainer YOUNGSTER, JOEY4 startbattle reloadmapafterbattle @@ -120,7 +120,7 @@ TrainerYoungsterJoey: clearflag ENGINE_JOEY end -.LoadFight4 +.LoadFight4: loadtrainer YOUNGSTER, JOEY5 startbattle reloadmapafterbattle @@ -249,7 +249,7 @@ Route30FruitTree2: Route30HiddenPotion: dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION - + Route30_JoeysRattataAttacksMovement: fix_facing diff --git a/maps/Route31.asm b/maps/Route31.asm index 4514ff0a2..61b67be11 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -67,19 +67,19 @@ TrainerBug_catcherWade1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_MAHOGANY iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_GOLDENROD iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer BUG_CATCHER, WADE1 startbattle reloadmapafterbattle @@ -87,7 +87,7 @@ TrainerBug_catcherWade1: clearflag ENGINE_WADE end -.LoadFight1 +.LoadFight1: loadtrainer BUG_CATCHER, WADE2 startbattle reloadmapafterbattle @@ -95,7 +95,7 @@ TrainerBug_catcherWade1: clearflag ENGINE_WADE end -.LoadFight2 +.LoadFight2: loadtrainer BUG_CATCHER, WADE3 startbattle reloadmapafterbattle @@ -103,7 +103,7 @@ TrainerBug_catcherWade1: clearflag ENGINE_WADE end -.LoadFight3 +.LoadFight3: loadtrainer BUG_CATCHER, WADE4 startbattle reloadmapafterbattle @@ -111,7 +111,7 @@ TrainerBug_catcherWade1: clearflag ENGINE_WADE end -.LoadFight4 +.LoadFight4: loadtrainer BUG_CATCHER, WADE5 startbattle reloadmapafterbattle @@ -128,25 +128,25 @@ TrainerBug_catcherWade1: iftrue .Przcureberry checkevent EVENT_WADE_HAS_BITTER_BERRY iftrue .BitterBerry -.Berry +.Berry: verbosegiveitem BERRY iffalse .PackFull jump .Done -.Psncureberry +.Psncureberry: verbosegiveitem PSNCUREBERRY iffalse .PackFull jump .Done -.Przcureberry +.Przcureberry: verbosegiveitem PRZCUREBERRY iffalse .PackFull jump .Done -.BitterBerry +.BitterBerry: verbosegiveitem BITTER_BERRY iffalse .PackFull -.Done +.Done: clearflag ENGINE_WADE_HAS_ITEM jump .AcceptedNumberSTD -.PackFull +.PackFull: jump .PackFullSTD .AskPhoneNumberSTD: diff --git a/maps/Route32.asm b/maps/Route32.asm index fbe1ac2ea..8e73a7b7b 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -45,7 +45,7 @@ Route32_MapScriptHeader: disappear ROUTE32_FRIEDA return -.FriedaAppears +.FriedaAppears: appear ROUTE32_FRIEDA return @@ -210,19 +210,19 @@ TrainerFisherRalph1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_LAKE_OF_RAGE iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_ECRUTEAK iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer FISHER, RALPH1 startbattle reloadmapafterbattle @@ -230,7 +230,7 @@ TrainerFisherRalph1: clearflag ENGINE_RALPH end -.LoadFight1 +.LoadFight1: loadtrainer FISHER, RALPH2 startbattle reloadmapafterbattle @@ -238,7 +238,7 @@ TrainerFisherRalph1: clearflag ENGINE_RALPH end -.LoadFight2 +.LoadFight2: loadtrainer FISHER, RALPH3 startbattle reloadmapafterbattle @@ -246,7 +246,7 @@ TrainerFisherRalph1: clearflag ENGINE_RALPH end -.LoadFight3 +.LoadFight3: loadtrainer FISHER, RALPH4 startbattle reloadmapafterbattle @@ -254,7 +254,7 @@ TrainerFisherRalph1: clearflag ENGINE_RALPH end -.LoadFight4 +.LoadFight4: loadtrainer FISHER, RALPH5 startbattle reloadmapafterbattle @@ -316,7 +316,7 @@ TrainerPicnickerLiz1: checkflag ENGINE_LIZ iftrue .Rematch checkcellnum PHONE_PICNICKER_LIZ - iftrue .NumberAccepted + iftrue .NumberAccepted checkevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain writetext PicnickerLiz1AfterText @@ -344,19 +344,19 @@ TrainerPicnickerLiz1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_ECRUTEAK iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer PICNICKER, LIZ1 startbattle reloadmapafterbattle @@ -364,7 +364,7 @@ TrainerPicnickerLiz1: clearflag ENGINE_LIZ end -.LoadFight1 +.LoadFight1: loadtrainer PICNICKER, LIZ2 startbattle reloadmapafterbattle @@ -372,7 +372,7 @@ TrainerPicnickerLiz1: clearflag ENGINE_LIZ end -.LoadFight2 +.LoadFight2: loadtrainer PICNICKER, LIZ3 startbattle reloadmapafterbattle @@ -380,7 +380,7 @@ TrainerPicnickerLiz1: clearflag ENGINE_LIZ end -.LoadFight3 +.LoadFight3: loadtrainer PICNICKER, LIZ4 startbattle reloadmapafterbattle @@ -388,7 +388,7 @@ TrainerPicnickerLiz1: clearflag ENGINE_LIZ end -.LoadFight4 +.LoadFight4: loadtrainer PICNICKER, LIZ5 startbattle reloadmapafterbattle @@ -468,7 +468,7 @@ FriedaScript: writetext MeetFriedaText buttonsound setevent EVENT_MET_FRIEDA_OF_FRIDAY -.MetFrieda +.MetFrieda: writetext FriedaGivesGiftText buttonsound verbosegiveitem POISON_BARB @@ -512,11 +512,11 @@ Route32PokeCenterSign: Route32HiddenGreatBall: dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL - + Route32HiddenSuperPotion: dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION - + Movement_Route32CooltrainerMPushesYouBackToViolet: step_up diff --git a/maps/Route33.asm b/maps/Route33.asm index 346f85513..383f32e67 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -53,19 +53,19 @@ TrainerHikerAnthony: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer HIKER, ANTHONY2 startbattle reloadmapafterbattle @@ -73,7 +73,7 @@ TrainerHikerAnthony: clearflag ENGINE_ANTHONY end -.LoadFight1 +.LoadFight1: loadtrainer HIKER, ANTHONY1 startbattle reloadmapafterbattle @@ -81,7 +81,7 @@ TrainerHikerAnthony: clearflag ENGINE_ANTHONY end -.LoadFight2 +.LoadFight2: loadtrainer HIKER, ANTHONY3 startbattle reloadmapafterbattle @@ -89,7 +89,7 @@ TrainerHikerAnthony: clearflag ENGINE_ANTHONY end -.LoadFight3 +.LoadFight3: loadtrainer HIKER, ANTHONY4 startbattle reloadmapafterbattle @@ -97,7 +97,7 @@ TrainerHikerAnthony: clearflag ENGINE_ANTHONY end -.LoadFight4 +.LoadFight4: loadtrainer HIKER, ANTHONY5 startbattle reloadmapafterbattle diff --git a/maps/Route34.asm b/maps/Route34.asm index 11e24770a..c9db5bcec 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -130,19 +130,19 @@ TrainerCamperTodd1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_BLACKTHORN iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_CIANWOOD iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer CAMPER, TODD1 startbattle reloadmapafterbattle @@ -150,7 +150,7 @@ TrainerCamperTodd1: clearflag ENGINE_TODD end -.LoadFight1 +.LoadFight1: loadtrainer CAMPER, TODD2 startbattle reloadmapafterbattle @@ -158,7 +158,7 @@ TrainerCamperTodd1: clearflag ENGINE_TODD end -.LoadFight2 +.LoadFight2: loadtrainer CAMPER, TODD3 startbattle reloadmapafterbattle @@ -166,7 +166,7 @@ TrainerCamperTodd1: clearflag ENGINE_TODD end -.LoadFight3 +.LoadFight3: loadtrainer CAMPER, TODD4 startbattle reloadmapafterbattle @@ -174,7 +174,7 @@ TrainerCamperTodd1: clearflag ENGINE_TODD end -.LoadFight4 +.LoadFight4: loadtrainer CAMPER, TODD5 startbattle reloadmapafterbattle @@ -255,19 +255,19 @@ TrainerPicnickerGina1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_MAHOGANY iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer PICNICKER, GINA1 startbattle reloadmapafterbattle @@ -275,7 +275,7 @@ TrainerPicnickerGina1: clearflag ENGINE_GINA end -.LoadFight1 +.LoadFight1: loadtrainer PICNICKER, GINA2 startbattle reloadmapafterbattle @@ -283,7 +283,7 @@ TrainerPicnickerGina1: clearflag ENGINE_GINA end -.LoadFight2 +.LoadFight2: loadtrainer PICNICKER, GINA3 startbattle reloadmapafterbattle @@ -291,7 +291,7 @@ TrainerPicnickerGina1: clearflag ENGINE_GINA end -.LoadFight3 +.LoadFight3: loadtrainer PICNICKER, GINA4 startbattle reloadmapafterbattle @@ -299,7 +299,7 @@ TrainerPicnickerGina1: clearflag ENGINE_GINA end -.LoadFight4 +.LoadFight4: loadtrainer PICNICKER, GINA5 startbattle reloadmapafterbattle @@ -492,11 +492,11 @@ Route34Nugget: Route34HiddenRareCandy: dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY - + Route34HiddenSuperPotion: dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION - + Route34MovementData_DayCareManWalksBackInside: slow_step_left diff --git a/maps/Route35.asm b/maps/Route35.asm index a46ce91df..afa3f8ce0 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -168,19 +168,19 @@ UnknownScript_0x19c9bb: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_BLACKTHORN iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_LAKE_OF_RAGE iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer BUG_CATCHER, ARNIE1 startbattle reloadmapafterbattle @@ -188,7 +188,7 @@ UnknownScript_0x19c9bb: clearflag ENGINE_ARNIE end -.LoadFight1 +.LoadFight1: loadtrainer BUG_CATCHER, ARNIE2 startbattle reloadmapafterbattle @@ -196,7 +196,7 @@ UnknownScript_0x19c9bb: clearflag ENGINE_ARNIE end -.LoadFight2 +.LoadFight2: loadtrainer BUG_CATCHER, ARNIE3 startbattle reloadmapafterbattle @@ -204,7 +204,7 @@ UnknownScript_0x19c9bb: clearflag ENGINE_ARNIE end -.LoadFight3 +.LoadFight3: loadtrainer BUG_CATCHER, ARNIE4 startbattle reloadmapafterbattle @@ -212,7 +212,7 @@ UnknownScript_0x19c9bb: clearflag ENGINE_ARNIE end -.LoadFight4 +.LoadFight4: loadtrainer BUG_CATCHER, ARNIE5 startbattle reloadmapafterbattle diff --git a/maps/Route36.asm b/maps/Route36.asm index ec9cdbf03..6b25577b7 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,33 +10,33 @@ const_value set 2 const ROUTE36_SUICUNE Route36_MapScriptHeader: -.MapTriggers +.MapTriggers: db 2 ; triggers dw .Trigger0, 0 dw .Trigger1, 0 -.MapCallbacks +.MapCallbacks: db 1 ; callbacks dbw MAPCALLBACK_OBJECTS, .ArthurCallback -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: end -.ArthurCallback +.ArthurCallback: checkcode VAR_WEEKDAY if_equal THURSDAY, .ArthurAppears disappear ROUTE36_ARTHUR return -.ArthurAppears +.ArthurAppears: appear ROUTE36_ARTHUR return @@ -63,7 +63,7 @@ SudowoodoScript: applymovement ROUTE36_WEIRD_TREE, SudowoodoShakeMovement end -.Fight +.Fight: opentext writetext UseSquirtbottleText yesorno @@ -119,12 +119,12 @@ Route36FloriaScript: disappear ROUTE36_FLORIA end -.Up +.Up: applymovement ROUTE36_FLORIA, FloriaMovement2 disappear ROUTE36_FLORIA end -.SecondTimeTalking +.SecondTimeTalking: writetext FloriaText2 waitbutton closetext @@ -142,16 +142,16 @@ Route36RockSmashGuyScript: closetext end -.ClearedSudowoodo +.ClearedSudowoodo: writetext RockSmashGuyText2 buttonsound verbosegiveitem TM_ROCK_SMASH iffalse .NoRoomForTM setevent EVENT_GOT_TM08_ROCK_SMASH -.AlreadyGotRockSmash +.AlreadyGotRockSmash: writetext RockSmashGuyText3 waitbutton -.NoRoomForTM +.NoRoomForTM: closetext end @@ -165,7 +165,7 @@ LassScript_0x1940e0: closetext end -.ClearedSudowoodo +.ClearedSudowoodo: writetext UnknownText_0x19469e waitbutton closetext @@ -174,7 +174,7 @@ LassScript_0x1940e0: TrainerSchoolboyAlan1: trainer EVENT_BEAT_SCHOOLBOY_ALAN, SCHOOLBOY, ALAN1, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script -.Script +.Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN end_if_just_battled opentext @@ -192,9 +192,9 @@ TrainerSchoolboyAlan1: scall .AskNumber1 jump .ContinueAskForPhoneNumber -.AskAgainForPhoneNumber +.AskAgainForPhoneNumber: scall .AskNumber2 -.ContinueAskForPhoneNumber +.ContinueAskForPhoneNumber: askforphonenumber PHONE_SCHOOLBOY_ALAN if_equal $1, .PhoneFull if_equal $2, .NumberDeclined @@ -202,7 +202,7 @@ TrainerSchoolboyAlan1: scall .RegisteredNumber jump .NumberAccepted -.ChooseRematch +.ChooseRematch: scall .Rematch winlosstext SchoolboyAlan1BeatenText, 0 copybytetovar wAlanFightCount @@ -211,19 +211,19 @@ TrainerSchoolboyAlan1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkflag ENGINE_FLYPOINT_BLACKTHORN iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_OLIVINE iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer SCHOOLBOY, ALAN1 startbattle reloadmapafterbattle @@ -231,7 +231,7 @@ TrainerSchoolboyAlan1: clearflag ENGINE_ALAN end -.LoadFight1 +.LoadFight1: loadtrainer SCHOOLBOY, ALAN2 startbattle reloadmapafterbattle @@ -239,7 +239,7 @@ TrainerSchoolboyAlan1: clearflag ENGINE_ALAN end -.LoadFight2 +.LoadFight2: loadtrainer SCHOOLBOY, ALAN3 startbattle reloadmapafterbattle @@ -247,7 +247,7 @@ TrainerSchoolboyAlan1: clearflag ENGINE_ALAN end -.LoadFight3 +.LoadFight3: loadtrainer SCHOOLBOY, ALAN4 startbattle reloadmapafterbattle @@ -255,14 +255,14 @@ TrainerSchoolboyAlan1: clearflag ENGINE_ALAN end -.LoadFight4 +.LoadFight4: loadtrainer SCHOOLBOY, ALAN5 startbattle reloadmapafterbattle clearflag ENGINE_ALAN end -.GiveFireStone +.GiveFireStone: scall .Gift verbosegiveitem FIRE_STONE iffalse .BagFull @@ -270,49 +270,49 @@ TrainerSchoolboyAlan1: setevent EVENT_ALAN_GAVE_FIRE_STONE jump .NumberAccepted -.BagFull +.BagFull: jump .PackFull -.AskNumber1 +.AskNumber1: jumpstd asknumber1m end -.AskNumber2 +.AskNumber2: jumpstd asknumber2m end -.RegisteredNumber +.RegisteredNumber: jumpstd registerednumberm end -.NumberAccepted +.NumberAccepted: jumpstd numberacceptedm end -.NumberDeclined +.NumberDeclined: jumpstd numberdeclinedm end -.PhoneFull +.PhoneFull: jumpstd phonefullm end -.Rematch +.Rematch: jumpstd rematchm end -.Gift +.Gift: jumpstd giftm end -.PackFull +.PackFull: jumpstd packfullm end TrainerPsychicMark: trainer EVENT_BEAT_PSYCHIC_MARK, PSYCHIC_T, MARK, PsychicMarkSeenText, PsychicMarkBeatenText, 0, .Script -.Script +.Script: end_if_just_battled opentext writetext UnknownText_0x19471e @@ -332,7 +332,7 @@ ArthurScript: writetext MeetArthurText buttonsound setevent EVENT_MET_ARTHUR_OF_THURSDAY -.MetArthur +.MetArthur: writetext ArthurGivesGiftText buttonsound verbosegiveitem HARD_STONE @@ -343,10 +343,10 @@ ArthurScript: closetext end -.AlreadyGotStone +.AlreadyGotStone: writetext ArthurThursdayText waitbutton -.BagFull +.BagFull: closetext end @@ -668,26 +668,26 @@ Route36_MapEventHeader: ; filler db 0, 0 -.Warps +.Warps: db 4 warp_def $8, $12, 3, ROUTE_36_NATIONAL_PARK_GATE warp_def $9, $12, 4, ROUTE_36_NATIONAL_PARK_GATE warp_def $d, $2f, 1, ROUTE_36_RUINS_OF_ALPH_GATE warp_def $d, $30, 2, ROUTE_36_RUINS_OF_ALPH_GATE -.XYTriggers +.XYTriggers: db 2 xy_trigger 1, $7, $14, $0, Route36SuicuneScript, $0, $0 xy_trigger 1, $7, $16, $0, Route36SuicuneScript, $0, $0 -.Signposts +.Signposts: db 4 signpost 1, 29, SIGNPOST_READ, Route36TrainerTips2 signpost 11, 45, SIGNPOST_READ, RuinsOfAlphNorthSign signpost 7, 55, SIGNPOST_READ, Route36Sign signpost 7, 21, SIGNPOST_READ, Route36TrainerTips1 -.PersonEvents +.PersonEvents: db 9 person_event SPRITE_YOUNGSTER, 13, 20, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicMark, -1 person_event SPRITE_YOUNGSTER, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSchoolboyAlan1, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 690a8a481..7c4b6e98f 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -24,7 +24,7 @@ SunnyCallback: disappear ROUTE37_SUNNY return -.SunnyAppears +.SunnyAppears: appear ROUTE37_SUNNY return @@ -73,13 +73,13 @@ SunnyScript: writetext MeetSunnyText buttonsound setevent EVENT_MET_SUNNY_OF_SUNDAY -.MetSunny +.MetSunny: checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Kris writetext SunnyGivesGiftText1 buttonsound jump .next -.Kris +.Kris: writetext SunnyGivesGiftText2 buttonsound .next @@ -118,7 +118,7 @@ FruitTreeScript_0x1a8e0d: Route37HiddenEther: dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER - + TwinsAnnandanne1SeenText: text "ANN: ANNE and I" diff --git a/maps/Route38.asm b/maps/Route38.asm index 319d15abb..85ba2a1d8 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -76,19 +76,19 @@ TrainerLassDana1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_CIANWOOD iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer LASS, DANA1 startbattle reloadmapafterbattle @@ -96,7 +96,7 @@ TrainerLassDana1: clearflag ENGINE_DANA end -.LoadFight1 +.LoadFight1: loadtrainer LASS, DANA2 startbattle reloadmapafterbattle @@ -104,7 +104,7 @@ TrainerLassDana1: clearflag ENGINE_DANA end -.LoadFight2 +.LoadFight2: loadtrainer LASS, DANA3 startbattle reloadmapafterbattle @@ -112,7 +112,7 @@ TrainerLassDana1: clearflag ENGINE_DANA end -.LoadFight3 +.LoadFight3: loadtrainer LASS, DANA4 startbattle reloadmapafterbattle @@ -120,7 +120,7 @@ TrainerLassDana1: clearflag ENGINE_DANA end -.LoadFight4 +.LoadFight4: loadtrainer LASS, DANA5 startbattle reloadmapafterbattle @@ -212,19 +212,19 @@ TrainerSchoolboyChad1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight4 +.Fight4: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight4 -.Fight3 +.Fight3: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight2 -.Fight1 +.Fight1: checkflag ENGINE_FLYPOINT_MAHOGANY iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer SCHOOLBOY, CHAD1 startbattle reloadmapafterbattle @@ -232,7 +232,7 @@ TrainerSchoolboyChad1: clearflag ENGINE_CHAD end -.LoadFight1 +.LoadFight1: loadtrainer SCHOOLBOY, CHAD2 startbattle reloadmapafterbattle @@ -240,7 +240,7 @@ TrainerSchoolboyChad1: clearflag ENGINE_CHAD end -.LoadFight2 +.LoadFight2: loadtrainer SCHOOLBOY, CHAD3 startbattle reloadmapafterbattle @@ -248,7 +248,7 @@ TrainerSchoolboyChad1: clearflag ENGINE_CHAD end -.LoadFight3 +.LoadFight3: loadtrainer SCHOOLBOY, CHAD4 startbattle reloadmapafterbattle @@ -256,7 +256,7 @@ TrainerSchoolboyChad1: clearflag ENGINE_CHAD end -.LoadFight4 +.LoadFight4: loadtrainer SCHOOLBOY, CHAD5 startbattle reloadmapafterbattle diff --git a/maps/Route39.asm b/maps/Route39.asm index 3145f9bba..10d548e0b 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -181,7 +181,7 @@ FruitTreeScript_0x1a5bf4: Route39HiddenNugget: dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET - + Route39MiltankText: text "MILTANK: Mooo!" diff --git a/maps/Route4.asm b/maps/Route4.asm index 331087fcf..bfea8c8aa 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -52,7 +52,7 @@ Route4HPUp: Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL - + Bird_keeperHankSeenText: text "I'm raising my" diff --git a/maps/Route40.asm b/maps/Route40.asm index 2d072c14d..e553ca735 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -30,7 +30,7 @@ MonicaCallback: disappear ROUTE40_MONICA return -.MonicaAppears +.MonicaAppears: appear ROUTE40_MONICA return @@ -107,7 +107,7 @@ MonicaScript: writetext MeetMonicaText buttonsound setevent EVENT_MET_MONICA_OF_MONDAY -.MetMonica +.MetMonica: writetext MonicaGivesGiftText buttonsound verbosegiveitem SHARP_BEAK diff --git a/maps/Route42.asm b/maps/Route42.asm index a09ef4350..2e4caf940 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -77,16 +77,16 @@ UnknownScript_0x1a927f: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight3 +.Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer FISHER, TULLY1 startbattle reloadmapafterbattle @@ -94,7 +94,7 @@ UnknownScript_0x1a927f: clearflag ENGINE_TULLY end -.LoadFight1 +.LoadFight1: loadtrainer FISHER, TULLY2 startbattle reloadmapafterbattle @@ -102,7 +102,7 @@ UnknownScript_0x1a927f: clearflag ENGINE_TULLY end -.LoadFight2 +.LoadFight2: loadtrainer FISHER, TULLY3 startbattle reloadmapafterbattle @@ -110,7 +110,7 @@ UnknownScript_0x1a927f: clearflag ENGINE_TULLY end -.LoadFight3 +.LoadFight3: loadtrainer FISHER, TULLY4 startbattle reloadmapafterbattle @@ -215,7 +215,7 @@ FruitTreeScript_0x1a9351: Route42HiddenMaxPotion: dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION - + MovementData_0x1a9356: db $39 ; movement diff --git a/maps/Route43.asm b/maps/Route43.asm index cb23df182..b3c3da115 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -88,16 +88,16 @@ UnknownScript_0x19d0cf: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight3 +.Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer POKEMANIAC, BRENT1 startbattle reloadmapafterbattle @@ -105,7 +105,7 @@ UnknownScript_0x19d0cf: clearflag ENGINE_BRENT end -.LoadFight1 +.LoadFight1: loadtrainer POKEMANIAC, BRENT2 startbattle reloadmapafterbattle @@ -113,7 +113,7 @@ UnknownScript_0x19d0cf: clearflag ENGINE_BRENT end -.LoadFight2 +.LoadFight2: loadtrainer POKEMANIAC, BRENT3 startbattle reloadmapafterbattle @@ -121,7 +121,7 @@ UnknownScript_0x19d0cf: clearflag ENGINE_BRENT end -.LoadFight3 +.LoadFight3: loadtrainer POKEMANIAC, BRENT4 startbattle reloadmapafterbattle @@ -219,16 +219,16 @@ UnknownScript_0x19d1c1: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight3 +.Fight3: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight3 -.Fight2 +.Fight2: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_CLEARED_RADIO_TOWER iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer PICNICKER, TIFFANY3 startbattle reloadmapafterbattle @@ -236,7 +236,7 @@ UnknownScript_0x19d1c1: clearflag ENGINE_TIFFANY end -.LoadFight1 +.LoadFight1: loadtrainer PICNICKER, TIFFANY1 startbattle reloadmapafterbattle @@ -244,7 +244,7 @@ UnknownScript_0x19d1c1: clearflag ENGINE_TIFFANY end -.LoadFight2 +.LoadFight2: loadtrainer PICNICKER, TIFFANY2 startbattle reloadmapafterbattle @@ -252,7 +252,7 @@ UnknownScript_0x19d1c1: clearflag ENGINE_TIFFANY end -.LoadFight3 +.LoadFight3: loadtrainer PICNICKER, TIFFANY4 startbattle reloadmapafterbattle diff --git a/maps/Route44.asm b/maps/Route44.asm index 73a6fcb02..48d7a2eb5 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -54,13 +54,13 @@ UnknownScript_0x19d86a: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer BIRD_KEEPER, VANCE1 startbattle reloadmapafterbattle @@ -68,7 +68,7 @@ UnknownScript_0x19d86a: clearflag ENGINE_VANCE end -.LoadFight1 +.LoadFight1: loadtrainer BIRD_KEEPER, VANCE2 startbattle reloadmapafterbattle @@ -76,7 +76,7 @@ UnknownScript_0x19d86a: clearflag ENGINE_VANCE end -.LoadFight2 +.LoadFight2: loadtrainer BIRD_KEEPER, VANCE3 startbattle reloadmapafterbattle @@ -198,13 +198,13 @@ UnknownScript_0x19d96e: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer FISHER, WILTON1 startbattle reloadmapafterbattle @@ -212,7 +212,7 @@ UnknownScript_0x19d96e: clearflag ENGINE_WILTON end -.LoadFight1 +.LoadFight1: loadtrainer FISHER, WILTON2 startbattle reloadmapafterbattle @@ -220,7 +220,7 @@ UnknownScript_0x19d96e: clearflag ENGINE_WILTON end -.LoadFight2 +.LoadFight2: loadtrainer FISHER, WILTON3 startbattle reloadmapafterbattle @@ -319,7 +319,7 @@ Route44MaxRepel: Route44HiddenElixer: dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER - + FisherWilton1SeenText: text "Aack! You made me" diff --git a/maps/Route45.asm b/maps/Route45.asm index c6953a2aa..67459ad8b 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -182,13 +182,13 @@ UnknownScript_0x19e1b8: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer HIKER, PARRY3 startbattle reloadmapafterbattle @@ -196,7 +196,7 @@ UnknownScript_0x19e1b8: clearflag ENGINE_PARRY end -.LoadFight1 +.LoadFight1: loadtrainer HIKER, PARRY1 startbattle reloadmapafterbattle @@ -204,7 +204,7 @@ UnknownScript_0x19e1b8: clearflag ENGINE_PARRY end -.LoadFight2 +.LoadFight2: loadtrainer HIKER, PARRY2 startbattle reloadmapafterbattle @@ -313,7 +313,7 @@ Route45MaxPotion: Route45HiddenPpUp: dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP - + HikerErikSeenText: text "Be prepared for" diff --git a/maps/Route46.asm b/maps/Route46.asm index c549b807a..ce4d4d5ec 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -60,13 +60,13 @@ UnknownScript_0x1a96da: if_equal 2, .Fight2 if_equal 1, .Fight1 if_equal 0, .LoadFight0 -.Fight2 +.Fight2: checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .LoadFight2 -.Fight1 +.Fight1: checkevent EVENT_BEAT_ELITE_FOUR iftrue .LoadFight1 -.LoadFight0 +.LoadFight0: loadtrainer PICNICKER, ERIN1 startbattle reloadmapafterbattle @@ -74,7 +74,7 @@ UnknownScript_0x1a96da: clearflag ENGINE_ERIN end -.LoadFight1 +.LoadFight1: loadtrainer PICNICKER, ERIN2 startbattle reloadmapafterbattle @@ -82,7 +82,7 @@ UnknownScript_0x1a96da: clearflag ENGINE_ERIN end -.LoadFight2 +.LoadFight2: loadtrainer PICNICKER, ERIN3 startbattle reloadmapafterbattle diff --git a/maps/Route9.asm b/maps/Route9.asm index 7168e683b..a8842e17b 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -84,7 +84,7 @@ Route9Sign: Route9HiddenEther: dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER - + CamperDeanSeenText: text "I came to explore" diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index e9d479850..c8acac06a 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -83,7 +83,7 @@ FisherScript_0x58061: setevent EVENT_TALKED_TO_RUINS_COWARD writetext UnknownText_0x583a4 buttonsound -.Next +.Next: writetext UnknownText_0x58420 waitbutton closetext diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 56db1e283..f26931fd8 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -18,7 +18,7 @@ WardensGranddaughter: closetext setevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER end -.AlreadyMet +.AlreadyMet: writetext WardensGranddaughterText2 waitbutton closetext diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 114e79ad7..121273939 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -18,7 +18,7 @@ SaffronCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON return diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 7ff9f504c..8e7dce341 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -40,7 +40,7 @@ SabrinaScript_0x189c2e: closetext end -.FightDone +.FightDone: writetext UnknownText_0x189f6c waitbutton closetext @@ -100,7 +100,7 @@ SaffronGymGuyScript: closetext end -.SaffronGymGuyWinScript +.SaffronGymGuyWinScript: writetext SaffronGymGuyWinText waitbutton closetext @@ -110,7 +110,7 @@ SaffronGymStatue: checkflag ENGINE_MARSHBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext SABRINA, 1, $1 jumpstd gymstatue2 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 82bfa156f..e9193a2fa 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -28,7 +28,7 @@ BlaineScript_0x1ab4fb: startbattle iftrue .ReturnAfterBattle appear SEAFOAMGYM_GYM_GUY -.ReturnAfterBattle +.ReturnAfterBattle: reloadmapafterbattle setevent EVENT_BEAT_BLAINE opentext @@ -41,7 +41,7 @@ BlaineScript_0x1ab4fb: closetext end -.FightDone +.FightDone: writetext UnknownText_0x1ab71c waitbutton closetext @@ -58,7 +58,7 @@ SeafoamGymGuyScript: setevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE end -.TalkedToSeafoamGymGuyScript +.TalkedToSeafoamGymGuyScript: writetext SeafoamGymGuyWinText2 waitbutton closetext diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 4cc6446ff..37e24d730 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -8,7 +8,7 @@ SilverCaveOutside_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE return diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 6bca1da26..84e05cdf7 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -25,11 +25,11 @@ SilverCaveRoom1UltraBall: SilverCaveRoom1HiddenDireHit: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT - + SilverCaveRoom1HiddenUltraBall: dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL - + SilverCaveRoom1_MapEventHeader: ; filler diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 274fea517..8fe28cd86 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -21,7 +21,7 @@ SilverCaveRoom2PPUp: SilverCaveRoom2HiddenMaxPotion: dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION - + SilverCaveRoom2_MapEventHeader: ; filler diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index d535c925b..9bbda8eae 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -546,7 +546,7 @@ TeamRocketBaseB1FGuardSpec: TeamRocketBaseB1FHiddenRevive: dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE - + SecurityCameraMovement1: big_step_right diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 1a06d6a70..01713758e 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -48,7 +48,7 @@ TransmitterDoorCallback: iftrue .Change return -.Change +.Change: changeblock $e, $c, $7 return @@ -322,7 +322,7 @@ UnknownScript_0x6d184: MapTeamRocketBaseB2FSignpostPtr1: dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER dw MapTeamRocketBaseB2FSignpost1Script - + MapTeamRocketBaseB2FSignpost1Script: opentext @@ -364,7 +364,7 @@ TeamRocketBaseB2FTMThief: TeamRocketBaseB2FHiddenFullHeal: dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL - + MovementData_0x6d212: step_right diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index dba82208f..049559b51 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -181,8 +181,8 @@ ScientistMitchScript: BossDoor: dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE dw .Script - -.Script + +.Script: opentext checkevent EVENT_LEARNED_SLOWPOKETAIL iffalse .NeedsPassword @@ -190,13 +190,13 @@ BossDoor: iffalse .NeedsPassword jump .OpenSesame -.NeedsPassword +.NeedsPassword: writetext UnknownText_0x6e970 waitbutton closetext end -.OpenSesame +.OpenSesame: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 5ebd80be6..2613f1630 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -47,7 +47,7 @@ UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse .Done appear TINTOWER1F_EUSINE -.Done +.Done: return UnknownScript_0x185050: @@ -86,7 +86,7 @@ TinTowerStairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .NoChange changeblock $a, $2, $9 -.NoChange +.NoChange: return SuicuneBattle: @@ -104,7 +104,7 @@ SuicuneBattle: disappear TINTOWER1F_RAIKOU playsound SFX_EXIT_BUILDING waitsfx -.Next1 +.Next1: writebyte ENTEI special SpecialMonCheck iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower @@ -117,7 +117,7 @@ SuicuneBattle: disappear TINTOWER1F_ENTEI playsound SFX_EXIT_BUILDING waitsfx -.Next2 +.Next2: spriteface PLAYER, UP pause 10 applymovement PLAYER, TinTowerPlayerMovement2 diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 44b683423..5abc17a22 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -21,7 +21,7 @@ TinTower4FEscapeRope: TinTower4FHiddenMaxPotion: dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION - + TinTower4F_MapEventHeader: ; filler diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index a8e668284..8c9c09730 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -13,11 +13,11 @@ TinTower5FRareCandy: TinTower5FHiddenFullRestore: dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE - + TinTower5FHiddenCarbos: dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS - + TinTower5F_MapEventHeader: ; filler diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index ca5e50bcf..f1ab17ccf 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -12,18 +12,18 @@ TinTowerRoof_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .HoOh -.HoOh +.HoOh: checkevent EVENT_FOUGHT_HO_OH iftrue .NoAppear checkitem RAINBOW_WING iftrue .Appear jump .NoAppear -.Appear +.Appear: appear TINTOWERROOF_HO_OH return -.NoAppear +.NoAppear: disappear TINTOWERROOF_HO_OH return diff --git a/maps/Underground.asm b/maps/Underground.asm index 526522c4e..e3c1ec3ca 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -7,11 +7,11 @@ Underground_MapScriptHeader: UndergroundHiddenFullRestore: dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE - + UndergroundHiddenXSpecial: dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL - + Underground_MapEventHeader: ; filler diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 078242827..967559b00 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -636,11 +636,11 @@ UndergroundPathSwitchRoomEntrancesFullHeal: UndergroundPathSwitchRoomEntrancesHiddenMaxPotion: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION - + UndergroundPathSwitchRoomEntrancesHiddenRevive: dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE - + UndergroundSilverApproachMovement1: step_down diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index d31bd9702..68b3147f9 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -17,16 +17,16 @@ UnionCaveB2F_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .Lapras -.Lapras +.Lapras: checkflag ENGINE_UNION_CAVE_LAPRAS iftrue .NoAppear checkcode VAR_WEEKDAY if_equal FRIDAY, .Appear -.NoAppear +.NoAppear: disappear UNIONCAVEB2F_LAPRAS return -.Appear +.Appear: appear UNIONCAVEB2F_LAPRAS return diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index c84321e78..2840e4ca3 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -16,7 +16,7 @@ VermilionCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return @@ -78,28 +78,28 @@ VermilionGymBadgeGuy: closetext end -.SomeBadges +.SomeBadges: writetext UnknownText_0x1aac2b waitbutton closetext end -.MostBadges +.MostBadges: writetext UnknownText_0x1aac88 waitbutton closetext end -.AllBadges +.AllBadges: writetext UnknownText_0x1aacf3 buttonsound verbosegiveitem HP_UP iffalse .Done setevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY -.AlreadyGotItem +.AlreadyGotItem: writetext UnknownText_0x1aad4a waitbutton -.Done +.Done: closetext end diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 209986a0f..4a2af8fc1 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -38,7 +38,7 @@ SurgeScript_0x1920a5: closetext end -.FightDone +.FightDone: writetext UnknownText_0x192303 waitbutton closetext @@ -87,7 +87,7 @@ VermilionGymGuyScript: closetext end -.VermilionGymGuyWinScript +.VermilionGymGuyWinScript: writetext VermilionGymGuyWinText waitbutton closetext @@ -100,7 +100,7 @@ VermilionGymStatue: checkflag ENGINE_THUNDERBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext LT_SURGE, 1, $1 jumpstd gymstatue2 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index d45df660b..bd2cd6e97 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -17,14 +17,14 @@ VermilionPort_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0 +.Trigger0: end -.Trigger1 +.Trigger1: priorityjump UnknownScript_0x74da6 end -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return @@ -200,7 +200,7 @@ SuperNerdScript_0x74ee6: VermilionPortHiddenIron: dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON - + MovementData_0x74ef1: step_down diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1e4b4ab72..7ebead201 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -115,11 +115,11 @@ VictoryRoadHPUp: VictoryRoadHiddenMaxPotion: dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION - + VictoryRoadHiddenFullHeal: dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL - + MovementData_0x74539: step_left diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index a3dedc8c1..a67c59e71 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -18,7 +18,7 @@ VioletCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_VIOLET return diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 28c1dd218..b67784821 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -31,7 +31,7 @@ FalknerScript_0x683c2: setflag ENGINE_ZEPHYRBADGE checkcode VAR_BADGES scall VioletGymTriggerRockets -.FightDone +.FightDone: checkevent EVENT_GOT_TM31_MUD_SLAP iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD @@ -60,10 +60,10 @@ VioletGymTriggerRockets: if_equal 6, .GoldenrodRockets end -.GoldenrodRockets +.GoldenrodRockets: jumpstd goldenrodrockets -.RadioTowerRockets +.RadioTowerRockets: jumpstd radiotowerrockets TrainerBird_keeperRod: @@ -98,7 +98,7 @@ VioletGymGuyScript: closetext end -.VioletGymGuyWinScript +.VioletGymGuyWinScript: writetext VioletGymGuyWinText waitbutton closetext @@ -108,7 +108,7 @@ VioletGymStatue: checkflag ENGINE_ZEPHYRBADGE iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext FALKNER, 1, $1 jumpstd gymstatue2 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 15d7fb0b1..117897a21 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -45,7 +45,7 @@ VioletPokeCenter1F_ElmsAideScript: waitsfx end -.AideWalksAroundPlayer +.AideWalksAroundPlayer: applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter spriteface PLAYER, DOWN applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 875c53e89..a1c2c0255 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -14,7 +14,7 @@ ViridianCity_MapScriptHeader: ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.FlyPoint +.FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN return @@ -45,7 +45,7 @@ GrampsScript_0x1a9a61: closetext end -.BlueReturned +.BlueReturned: writetext UnknownText_0x1a9c7e waitbutton closetext diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index c97d0a180..f8e4b8e77 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -32,7 +32,7 @@ BlueScript_0x9aa26: closetext end -.FightDone +.FightDone: writetext LeaderBlueEpilogueText waitbutton closetext @@ -48,7 +48,7 @@ ViridianGymGuyScript: closetext end -.ViridianGymGuyWinScript +.ViridianGymGuyWinScript: writetext ViridianGymGuyWinText waitbutton closetext @@ -59,7 +59,7 @@ ViridianGymStatue: iftrue .Beaten jumpstd gymstatue1 -.Beaten +.Beaten: trainertotext BLUE, 1, $1 jumpstd gymstatue2 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index c8eccee2c..a19338f05 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -24,7 +24,7 @@ CooltrainerMScript_0x9b693: closetext end -.BlueReturned +.BlueReturned: writetext UnknownText_0x9b6f5 waitbutton closetext diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 05e662ace..c53c02f2b 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -415,15 +415,15 @@ MapWarehouseEntranceSignpost1Script: WarehouseEntranceHiddenParlyzHeal: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL - + WarehouseEntranceHiddenSuperPotion: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION - + WarehouseEntranceHiddenAntidote: dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE - + SupernerdEricSeenText: text "I got booted out" diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index e425c80ca..bc6e06e6d 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -33,15 +33,15 @@ WhirlIslandB1FBoulder: WhirlIslandB1FHiddenRareCandy: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY - + WhirlIslandB1FHiddenUltraBall: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL - + WhirlIslandB1FHiddenFullRestore: dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE - + WhirlIslandB1F_MapEventHeader: ; filler diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index f014d8ea8..79b9eb2aa 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -12,18 +12,18 @@ WhirlIslandLugiaChamber_MapScriptHeader: dbw MAPCALLBACK_OBJECTS, .Lugia -.Lugia +.Lugia: checkevent EVENT_FOUGHT_LUGIA iftrue .NoAppear checkitem SILVER_WING iftrue .Appear jump .NoAppear -.Appear +.Appear: appear WHIRLISLANDLUGIACHAMBER_LUGIA return -.NoAppear +.NoAppear: disappear WHIRLISLANDLUGIACHAMBER_LUGIA return |