Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style

This commit is contained in:
pikalaxalt
2016-04-10 14:42:14 -04:00
parent 46ead9b849
commit bf73772a56
537 changed files with 4562 additions and 4562 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -19,7 +19,7 @@ CeladonCity_MapScriptHeader:
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_CELADON
return

View File

@@ -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@"

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -16,7 +16,7 @@ CeruleanCity_MapScriptHeader:
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint
.FlyPoint:
setflag ENGINE_FLYPOINT_CERULEAN
return

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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:

Some files were not shown because too many files have changed in this diff Show More