No more NONE

This commit is contained in:
PikalaxALT
2015-11-02 14:37:02 -05:00
parent e0d6e9ca7a
commit 72af3337fd
185 changed files with 1343 additions and 1345 deletions

View File

@@ -13,7 +13,7 @@ BugsyScript:
writetext BugsyText_INeverLose
closetext
loadmovesprites
winlosstext BugsyText_ResearchIncomplete, NONE
winlosstext BugsyText_ResearchIncomplete, 0
loadtrainer BUGSY, 1
startbattle
returnafterbattle
@@ -61,7 +61,7 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, NONE, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@@ -72,7 +72,7 @@ TrainerTwinsAmyandmay1:
end
TrainerTwinsAmyandmay2:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, NONE, .AfterScript
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@@ -83,7 +83,7 @@ TrainerTwinsAmyandmay2:
end
TrainerBug_catcherbenny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@@ -94,7 +94,7 @@ TrainerBug_catcherbenny:
end
TrainerBug_catcherAl:
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel
@@ -105,7 +105,7 @@ TrainerBug_catcherAl:
end
TrainerBug_catcherJosh:
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, NONE, .AfterScript
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript
.AfterScript:
talkaftercancel

View File

@@ -3,7 +3,7 @@ AzaleaPokeCenter1F_MapScriptHeader:
db 1
; triggers
dw UnknownScript_0x18db27, NONE
dw UnknownScript_0x18db27, 0
.MapCallbacks:
db 0

View File

@@ -3,9 +3,9 @@ AzaleaTown_MapScriptHeader:
db 3
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 1

View File

@@ -3,8 +3,8 @@ BattleTower1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9e39d, NONE
dw UnknownScript_0x9e3d3, NONE
dw UnknownScript_0x9e39d, 0
dw UnknownScript_0x9e3d3, 0
.MapCallbacks:
db 0

View File

@@ -3,8 +3,8 @@ BattleTowerBattleRoom_MapScriptHeader:
db 2
; triggers
dw Script_EnterBattleRoom, NONE
dw UnknownScript_0x9f420, NONE
dw Script_EnterBattleRoom, 0
dw UnknownScript_0x9f420, 0
.MapCallbacks:
db 0

View File

@@ -3,8 +3,8 @@ BattleTowerElevator_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f562, NONE
dw UnknownScript_0x9f567, NONE
dw UnknownScript_0x9f562, 0
dw UnknownScript_0x9f567, 0
.MapCallbacks:
db 0

View File

@@ -3,8 +3,8 @@ BattleTowerHallway_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f5bb, NONE
dw UnknownScript_0x9f5c0, NONE
dw UnknownScript_0x9f5bb, 0
dw UnknownScript_0x9f5c0, 0
.MapCallbacks:
db 0

View File

@@ -33,7 +33,7 @@ ClairScript_0x194e24:
writetext UnknownText_0x194efa
closetext
loadmovesprites
winlosstext UnknownText_0x194fd6, NONE
winlosstext UnknownText_0x194fd6, 0
loadtrainer CLAIR, 1
startbattle
returnafterbattle
@@ -87,7 +87,7 @@ UnknownScript_0x194e94:
end
TrainerCooltrainermPaul:
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, NONE, CooltrainermPaulScript
trainer EVENT_BEAT_COOLTRAINERM_PAUL, COOLTRAINERM, PAUL, CooltrainermPaulSeenText, CooltrainermPaulBeatenText, 0, CooltrainermPaulScript
CooltrainermPaulScript:
talkaftercancel
@@ -98,7 +98,7 @@ CooltrainermPaulScript:
end
TrainerCooltrainermMike:
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, NONE, CooltrainermMikeScript
trainer EVENT_BEAT_COOLTRAINERM_MIKE, COOLTRAINERM, MIKE, CooltrainermMikeSeenText, CooltrainermMikeBeatenText, 0, CooltrainermMikeScript
CooltrainermMikeScript:
talkaftercancel
@@ -109,7 +109,7 @@ CooltrainermMikeScript:
end
TrainerCooltrainerfLola:
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, NONE, CooltrainerfLolaScript
trainer EVENT_BEAT_COOLTRAINERF_LOLA, COOLTRAINERF, LOLA, CooltrainerfLolaSeenText, CooltrainerfLolaBeatenText, 0, CooltrainerfLolaScript
CooltrainerfLolaScript:
talkaftercancel

View File

@@ -59,7 +59,7 @@ BlackthornGymBoulder:
jumpstd strengthboulder
TrainerCooltrainermCody:
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, NONE, CooltrainermCodyScript
trainer EVENT_BEAT_COOLTRAINERM_CODY, COOLTRAINERM, CODY, CooltrainermCodySeenText, CooltrainermCodyBeatenText, 0, CooltrainermCodyScript
CooltrainermCodyScript:
talkaftercancel
@@ -70,7 +70,7 @@ CooltrainermCodyScript:
end
TrainerCooltrainerfFran:
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, NONE, CooltrainerfFranScript
trainer EVENT_BEAT_COOLTRAINERF_FRAN, COOLTRAINERF, FRAN, CooltrainerfFranSeenText, CooltrainerfFranBeatenText, 0, CooltrainerfFranScript
CooltrainerfFranScript:
talkaftercancel

View File

@@ -3,8 +3,8 @@ BrunosRoom_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x180993, NONE
dw UnknownScript_0x180997, NONE
dw UnknownScript_0x180993, 0
dw UnknownScript_0x180997, 0
.MapCallbacks:
db 1
@@ -52,7 +52,7 @@ BrunoScript_0x1809c5:
writetext UnknownText_0x1809fe
closetext
loadmovesprites
winlosstext UnknownText_0x180b23, NONE
winlosstext UnknownText_0x180b23, 0
loadtrainer BRUNO, 1
startbattle
returnafterbattle

View File

@@ -3,9 +3,9 @@ BurnedTower1F_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x185bf2, NONE
dw UnknownScript_0x185bf6, NONE
dw UnknownScript_0x185bf7, NONE
dw UnknownScript_0x185bf2, 0
dw UnknownScript_0x185bf6, 0
dw UnknownScript_0x185bf7, 0
.MapCallbacks:
db 1

View File

@@ -3,8 +3,8 @@ BurnedTowerB1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x18615e, NONE
dw UnknownScript_0x18615f, NONE
dw UnknownScript_0x18615e, 0
dw UnknownScript_0x18615f, 0
.MapCallbacks:
db 1

View File

@@ -13,7 +13,7 @@ ErikaScript_0x72a6a:
writetext UnknownText_0x72b28
closetext
loadmovesprites
winlosstext UnknownText_0x72c3e, NONE
winlosstext UnknownText_0x72c3e, 0
loadtrainer ERIKA, 1
startbattle
returnafterbattle
@@ -42,7 +42,7 @@ UnknownScript_0x72aae:
end
TrainerLassMichelle:
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, NONE, LassMichelleScript
trainer EVENT_BEAT_LASS_MICHELLE, LASS, MICHELLE, LassMichelleSeenText, LassMichelleBeatenText, 0, LassMichelleScript
LassMichelleScript:
talkaftercancel
@@ -53,7 +53,7 @@ LassMichelleScript:
end
TrainerPicnickerTanya:
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, NONE, PicnickerTanyaScript
trainer EVENT_BEAT_PICNICKER_TANYA, PICNICKER, TANYA, PicnickerTanyaSeenText, PicnickerTanyaBeatenText, 0, PicnickerTanyaScript
PicnickerTanyaScript:
talkaftercancel
@@ -64,7 +64,7 @@ PicnickerTanyaScript:
end
TrainerBeautyJulia:
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, NONE, BeautyJuliaScript
trainer EVENT_BEAT_BEAUTY_JULIA, BEAUTY, JULIA, BeautyJuliaSeenText, BeautyJuliaBeatenText, 0, BeautyJuliaScript
BeautyJuliaScript:
talkaftercancel
@@ -75,7 +75,7 @@ BeautyJuliaScript:
end
TrainerTwinsJoandzoe1:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, NONE, TwinsJoandzoe1Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE1, TwinsJoandzoe1SeenText, TwinsJoandzoe1BeatenText, 0, TwinsJoandzoe1Script
TwinsJoandzoe1Script:
talkaftercancel
@@ -86,7 +86,7 @@ TwinsJoandzoe1Script:
end
TrainerTwinsJoandzoe2:
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, NONE, TwinsJoandzoe2Script
trainer EVENT_BEAT_TWINS_JO_AND_ZOE, TWINS, JOANDZOE2, TwinsJoandzoe2SeenText, TwinsJoandzoe2BeatenText, 0, TwinsJoandzoe2Script
TwinsJoandzoe2Script:
talkaftercancel

View File

@@ -3,8 +3,8 @@ CeruleanGym_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x1883d9, NONE
dw UnknownScript_0x1883da, NONE
dw UnknownScript_0x1883d9, 0
dw UnknownScript_0x1883da, 0
.MapCallbacks:
db 0
@@ -60,7 +60,7 @@ MistyScript_0x188432:
writetext UnknownText_0x188674
closetext
loadmovesprites
winlosstext UnknownText_0x18870c, NONE
winlosstext UnknownText_0x18870c, 0
loadtrainer MISTY, 1
startbattle
returnafterbattle
@@ -80,7 +80,7 @@ MistyScript_0x188432:
end
TrainerSwimmerfDiana:
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, NONE, SwimmerfDianaScript
trainer EVENT_BEAT_SWIMMERF_DIANA, SWIMMERF, DIANA, SwimmerfDianaSeenText, SwimmerfDianaBeatenText, 0, SwimmerfDianaScript
SwimmerfDianaScript:
talkaftercancel
@@ -91,7 +91,7 @@ SwimmerfDianaScript:
end
TrainerSwimmerfBriana:
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, NONE, SwimmerfBrianaScript
trainer EVENT_BEAT_SWIMMERF_BRIANA, SWIMMERF, BRIANA, SwimmerfBrianaSeenText, SwimmerfBrianaBeatenText, 0, SwimmerfBrianaScript
SwimmerfBrianaScript:
talkaftercancel
@@ -102,7 +102,7 @@ SwimmerfBrianaScript:
end
TrainerSwimmermParker:
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, NONE, SwimmermParkerScript
trainer EVENT_BEAT_SWIMMERM_PARKER, SWIMMERM, PARKER, SwimmermParkerSeenText, SwimmermParkerBeatenText, 0, SwimmermParkerScript
SwimmermParkerScript:
talkaftercancel

View File

@@ -3,8 +3,8 @@ CherrygroveCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1

View File

@@ -9,7 +9,7 @@ ClerkScript_0x19680a:
loadfont
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
iftrue UnknownScript_0x196817
pokemart $0, NONE
pokemart $0, 0
loadmovesprites
end

View File

@@ -3,8 +3,8 @@ CianwoodCity_MapScriptHeader:
db 2
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger1, 0
dw .Trigger2, 0
.MapCallbacks:
db 1
@@ -52,7 +52,7 @@ UnknownScript_0x1a001e:
writetext UnknownText_0x1a0433
closetext
loadmovesprites
winlosstext UnknownText_0x1a05a1, NONE
winlosstext UnknownText_0x1a05a1, 0
setlasttalked $c
loadtrainer MYSTICALMAN, EUSINE
startbattle

View File

@@ -28,7 +28,7 @@ ChuckScript_0x9d60f:
writetext UnknownText_0x9d78a
closetext
loadmovesprites
winlosstext UnknownText_0x9d7f6, NONE
winlosstext UnknownText_0x9d7f6, 0
loadtrainer CHUCK, 1
startbattle
returnafterbattle
@@ -76,7 +76,7 @@ CianwoodGymTriggerRockets:
jumpstd radiotowerrockets
TrainerBlackbeltYoshi:
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, NONE, BlackbeltYoshiScript
trainer EVENT_BEAT_BLACKBELT_YOSHI, BLACKBELT_T, YOSHI, BlackbeltYoshiSeenText, BlackbeltYoshiBeatenText, 0, BlackbeltYoshiScript
BlackbeltYoshiScript:
talkaftercancel
@@ -87,7 +87,7 @@ BlackbeltYoshiScript:
end
TrainerBlackbeltLao:
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, NONE, BlackbeltLaoScript
trainer EVENT_BEAT_BLACKBELT_LAO, BLACKBELT_T, LAO, BlackbeltLaoSeenText, BlackbeltLaoBeatenText, 0, BlackbeltLaoScript
BlackbeltLaoScript:
talkaftercancel
@@ -98,7 +98,7 @@ BlackbeltLaoScript:
end
TrainerBlackbeltNob:
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, NONE, BlackbeltNobScript
trainer EVENT_BEAT_BLACKBELT_NOB, BLACKBELT_T, NOB, BlackbeltNobSeenText, BlackbeltNobBeatenText, 0, BlackbeltNobScript
BlackbeltNobScript:
talkaftercancel
@@ -109,7 +109,7 @@ BlackbeltNobScript:
end
TrainerBlackbeltLung:
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, NONE, BlackbeltLungScript
trainer EVENT_BEAT_BLACKBELT_LUNG, BLACKBELT_T, LUNG, BlackbeltLungSeenText, BlackbeltLungBeatenText, 0, BlackbeltLungScript
BlackbeltLungScript:
talkaftercancel

View File

@@ -3,7 +3,7 @@ CianwoodPharmacy_MapScriptHeader:
db 1
; triggers
dw CianwoodPharmacyTrigger, NONE
dw CianwoodPharmacyTrigger, 0
.MapCallbacks:
db 0

View File

@@ -3,9 +3,9 @@ Colosseum_MapScriptHeader:
db 3
; triggers
dw .Trigger1, NONE
dw .Trigger2, NONE
dw .Trigger3, NONE
dw .Trigger1, 0
dw .Trigger2, 0
dw .Trigger3, 0
.MapCallbacks:
db 2

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