Local labels starting with lowercase letters are no longer decorated with a trailing colon

This commit is contained in:
pikalaxalt
2016-04-10 15:01:49 -04:00
parent bf73772a56
commit 6be4cd4da9
99 changed files with 470 additions and 470 deletions

View File

@@ -33,7 +33,7 @@ BattleTower1F_MapScriptHeader:
priorityjump Script_ResumeBattleTowerChallenge
end
.priorityjump1:
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
@@ -203,7 +203,7 @@ UnreferencedScript_0x9e4ea:
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
.zero:
.zero
writetext Text_CantBeRegistered
continue:
yesorno

View File

@@ -24,7 +24,7 @@ BattleTowerHallway_MapScriptHeader:
jump .WalkToChosenBattleRoom
.asm_load_battle_room:
.asm_load_battle_room
ld a, [rSVBK]
push af

View File

@@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle
jump .returnfrombattle
.totodile:
.totodile
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_7
@@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle
jump .returnfrombattle
.chikorita:
.chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_8
@@ -97,7 +97,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle
jump .returnfrombattle
.returnfrombattle:
.returnfrombattle
playmusic MUSIC_RIVAL_AFTER
opentext
writetext BurnedTowerSilver_AfterText1

View File

@@ -33,7 +33,7 @@ CeladonPrizeRoom_tmcounterloop:
if_equal $3, .hyperbeam
jump CeladonPrizeRoom_cancel
.doubleteam:
.doubleteam
checkcoins 1500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, $0
@@ -44,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop:
takecoins 1500
jump CeladonPrizeRoom_purchased
.psychic:
.psychic
checkcoins 3500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC, $0
@@ -55,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop:
takecoins 3500
jump CeladonPrizeRoom_purchased
.hyperbeam:
.hyperbeam
checkcoins 7500
if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, $0
@@ -126,7 +126,7 @@ GoldenrodGameCornerPokemonVendor:
waitbutton
checkitem COIN_CASE
iffalse CeladonPrizeRoom_NoCoinCase
.loop:
.loop
writetext CeladonPrizeRoom_AskWhichPrizeText
special Special_DisplayCoinCaseBalance
loadmenudata .MenuDataHeader
@@ -137,7 +137,7 @@ GoldenrodGameCornerPokemonVendor:
if_equal $3, .larvitar
jump CeladonPrizeRoom_cancel
.pikachu:
.pikachu
checkcoins 2222
if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
@@ -155,7 +155,7 @@ GoldenrodGameCornerPokemonVendor:
takecoins 2222
jump .loop
.porygon:
.porygon
checkcoins 5555
if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT
@@ -173,7 +173,7 @@ GoldenrodGameCornerPokemonVendor:
takecoins 5555
jump .loop
.larvitar:
.larvitar
checkcoins 8888
if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT

View File

@@ -18,7 +18,7 @@ SuperNerdScript_0x188212:
iftrue .mobile
jumptextfaceplayer UnknownText_0x188221
.mobile:
.mobile
jumptextfaceplayer UnknownText_0x18828c
GymGuyScript_0x18821e:

View File

@@ -67,7 +67,7 @@ EcruteakPokeCenter1FPokefanMScript:
iftrue .mobile
jumptextfaceplayer EcruteakPokeCenter1FPokefanMText
.mobile:
.mobile
jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile
EcruteakPokeCenter1FCooltrainerFScript:

View File

@@ -57,7 +57,7 @@ GuitaristClydeScript:
closetext
end
.mobile:
.mobile
opentext
writetext UnknownText_0x75cfe
waitbutton

View File

@@ -23,7 +23,7 @@ GoldenrodDeptStore5F_MapScriptHeader:
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return
.yes:
.yes
appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return
@@ -36,27 +36,27 @@ ClerkScript_0x5609c:
iftrue .onlyrocksmash
jump .neither
.headbutt:
.headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .both
jump .onlyheadbutt
.neither:
.neither
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
closetext
end
.onlyheadbutt:
.onlyheadbutt
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2
closetext
end
.onlyrocksmash:
.onlyrocksmash
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3
closetext
end
.both:
.both
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4
closetext
end

View File

@@ -176,7 +176,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
if_equal $3, .wobbuffet
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.abra:
.abra
checkcoins 100
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
@@ -194,7 +194,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 100
jump .loop
.cubone:
.cubone
checkcoins 800
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT
@@ -212,7 +212,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 800
jump .loop
.wobbuffet:
.wobbuffet
checkcoins 1500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT

View File

@@ -21,7 +21,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
.gsball:
.gsball
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue .cancel
playsound SFX_EXIT_BUILDING
@@ -44,7 +44,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
special RestartMapMusic
disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playsound SFX_EXIT_BUILDING
.cancel:
.cancel
end
GoldenrodPokeCenter1F_GSBallTriggerRight:
@@ -53,7 +53,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight:
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
.gsball:
.gsball
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue .cancel
playsound SFX_EXIT_BUILDING
@@ -76,7 +76,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight:
special RestartMapMusic
disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playsound SFX_EXIT_BUILDING
.cancel:
.cancel
end
GameboyKidScript_0x6101e:

View File

@@ -30,7 +30,7 @@ ManiaScript:
setevent EVENT_GOT_SHUCKIE
end
.alreadyhaveshuckie:
.alreadyhaveshuckie
checkflag ENGINE_SHUCKLE_GIVEN
iffalse .returnshuckie
writetext ManiaText_TakeCareOfShuckle
@@ -38,19 +38,19 @@ ManiaScript:
closetext
end
.partyfull:
.partyfull
writetext ManiaText_PartyFull
waitbutton
closetext
end
.refusetotakeshuckie:
.refusetotakeshuckie
writetext ManiaText_IfHeComesBack
waitbutton
closetext
end
.returnshuckie:
.returnshuckie
writetext ManiaText_CanIHaveMyMonBack
yesorno
iffalse .refused
@@ -65,32 +65,32 @@ ManiaScript:
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
.wrong:
.wrong
writetext ManiaText_ShuckleNotThere
waitbutton
closetext
end
.superhappy:
.superhappy
writetext ManiaText_ShuckleLikesYou
waitbutton
closetext
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end
.refused:
.refused
writetext ManiaText_SameAsBeingRobbed
waitbutton
closetext
end
.nothingleft:
.nothingleft
writetext ManiaText_ShuckleIsYourLastMon
waitbutton
closetext
end
.default_postevent:
.default_postevent
writetext ManiaText_HappinessSpeech
waitbutton
closetext

View File

@@ -31,7 +31,7 @@ MapMobileBattleRoomSignpost0Script:
if_equal $2, .two_
jump .false
.one_:
.one_
writetext MobileBattleRoom_HealText
pause 20
closetext
@@ -42,18 +42,18 @@ MapMobileBattleRoomSignpost0Script:
special FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_:
.two_
special Mobile_HealParty
special HealParty
special Function10383c
iftrue .false
.one:
.one
special Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
special Function101225
.false:
.false
closetext
end

View File

@@ -37,7 +37,7 @@ GentlemanScript_0x5cd3d:
special Special_CheckLuckyNumberShowFlag
iffalse .skip
special Special_ResetLuckyNumberShowFlag
.skip:
.skip
special Special_PrintTodaysLuckyNumber
checkflag ENGINE_LUCKY_NUMBER_SHOW
iftrue .GameOver

View File

@@ -159,13 +159,13 @@ CooltrainerMScript_0x1a1031:
iftrue .day_morn
checknite
iftrue .nite
.day_morn:
.day_morn
writetext Text_WaitingForNight
waitbutton
closetext
end
.nite:
.nite
writetext Text_WaitingForMorning
waitbutton
closetext

View File

@@ -135,7 +135,7 @@ TrainerYoungsterJoey:
setevent EVENT_GOT_HP_UP_FROM_JOEY
jump .NumberAccepted
.done:
.done
end
.GiveHPUp:

View File

@@ -142,7 +142,7 @@ _OfferToSellSlowpokeTail:
closetext
end
.refused:
.refused
writetext Text_RefusedToBuySlowpokeTail
waitbutton
closetext

View File

@@ -69,10 +69,10 @@ DayCareManScript_Outside:
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
playsound SFX_ENTER_DOOR
disappear ROUTE34_GRAMPS
.end_fail:
.end_fail
end
.walk_around_player:
.walk_around_player
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer
playsound SFX_ENTER_DOOR
disappear ROUTE34_GRAMPS

View File

@@ -33,34 +33,34 @@ OfficerScript_0x69d37:
givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail
setevent EVENT_GOT_KENYA
.alreadyhavekenya:
.alreadyhavekenya
writetext UnknownText_0x69ed6
waitbutton
closetext
end
.partyfull:
.partyfull
writetext UnknownText_0x69f56
waitbutton
closetext
end
.refused:
.refused
writetext UnknownText_0x69f74
waitbutton
closetext
end
.questcomplete:
.questcomplete
writetext UnknownText_0x69f8b
buttonsound
verbosegiveitem HP_UP
iffalse .bagfull
setevent EVENT_GOT_HP_UP_FROM_RANDY
.gothpup:
.gothpup
writetext UnknownText_0x69fd9
waitbutton
.bagfull:
.bagfull
closetext
end
@@ -85,7 +85,7 @@ PokefanFScript_0x69dc6:
closetext
end
.aftersudowoodo:
.aftersudowoodo
writetext UnknownText_0x6a09a
waitbutton
closetext

View File

@@ -17,7 +17,7 @@ Route38_MapScriptHeader:
TrainerBird_keeperToby:
trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script
.script:
.script
end_if_just_battled
opentext
writetext UnknownText_0x1a1f86
@@ -28,7 +28,7 @@ TrainerBird_keeperToby:
TrainerSailorHarry:
trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script
.script:
.script
end_if_just_battled
opentext
writetext UnknownText_0x1a220c
@@ -39,7 +39,7 @@ TrainerSailorHarry:
TrainerLassDana1:
trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script
.script:
.script
writecode VAR_CALLERID, PHONE_LASS_DANA
end_if_just_battled
opentext
@@ -177,7 +177,7 @@ TrainerLassDana1:
TrainerSchoolboyChad1:
trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script
.script:
.script
writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
end_if_just_battled
opentext
@@ -294,7 +294,7 @@ TrainerSchoolboyChad1:
TrainerBeautyValerie:
trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script
.script:
.script
end_if_just_battled
opentext
writetext UnknownText_0x1a2185
@@ -305,7 +305,7 @@ TrainerBeautyValerie:
TrainerBeautyOlivia:
trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script
.script:
.script
end_if_just_battled
opentext
writetext UnknownText_0x1a229a

View File

@@ -86,7 +86,7 @@ PokefanMScript_0x1a61c7:
iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a
.mobile:
.mobile
jumptextfaceplayer UnknownText_0x1a649b
LassScript_0x1a61d3:

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