Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish consistent Special function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 17:47:58 +01:00
parent f1ea15bbfe
commit b4a49351c1
47 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
maps/BattleTower1F.asm
View File

@@ -16,10 +16,10 @@ BattleTower1F_MapScriptHeader:
.Scene0:
writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction
special Special_BattleTowerAction
iffalse .SkipEverything
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
special Special_BattleTowerAction
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
@@ -34,9 +34,9 @@ BattleTower1F_MapScriptHeader:
.priorityjump1
priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
.SkipEverything:
setscene $1
.Scene1:
@@ -55,13 +55,13 @@ UnknownScript_0x9e3e0:
ReceptionistScript_0x9e3e2:
writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState
special BattleTowerAction
special Special_BattleTowerAction
if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm
opentext
writetext Text_BattleTowerWelcomesYou
buttonsound
writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_Menu_ChallengeExplanationCancel
jump Script_BattleTowerIntroductionYesNo
@@ -75,8 +75,8 @@ Script_Menu_ChallengeExplanationCancel: ; 0x9e3fc
Script_ChooseChallenge: ; 0x9e40f
writebyte BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
special BattleTowerAction
special SpecialCheckForBattleTowerRules
special Special_BattleTowerAction
special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
writetext Text_SaveBeforeEnteringBattleRoom
yesorno
@@ -86,23 +86,23 @@ Script_ChooseChallenge: ; 0x9e40f
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction
special BattleTowerRoomMenu
special Special_BattleTowerAction
special Special_BattleTowerRoomMenu
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writebyte BATTLETOWERACTION_11
special BattleTowerAction
special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
closetext
writebyte BATTLETOWERACTION_CHOOSEREWARD
special BattleTowerAction
special Special_BattleTowerAction
jump Script_WalkToBattleTowerElevator
Script_ResumeBattleTowerChallenge:
closetext
writebyte BATTLETOWERACTION_LOADLEVELGROUP ; load choice of level group
special BattleTowerAction
special Special_BattleTowerAction
Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, $0
@@ -111,7 +111,7 @@ Script_WalkToBattleTowerElevator:
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A
special BattleTowerAction
special Special_BattleTowerAction
warpsound
disappear BATTLETOWER1F_RECEPTIONIST
stopfollow
@@ -121,15 +121,15 @@ Script_WalkToBattleTowerElevator:
Script_GivePlayerHisPrize: ; 0x9e47a
writebyte BATTLETOWERACTION_1C
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_GIVEREWARD
special BattleTowerAction
special Special_BattleTowerAction
if_equal POTION, Script_YourPackIsStuffedFull
itemtotext $0, $1
giveitem ITEM_FROM_MEM, 5
writetext Text_PlayerGotFive
writebyte BATTLETOWERACTION_1D
special BattleTowerAction
special Special_BattleTowerAction
closetext
end
@@ -147,7 +147,7 @@ Script_BattleTowerExplanation: ; 0x9e4a5
writetext Text_BattleTowerIntroduction_2
Script_BattleTowerSkipExplanation:
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Special_BattleTowerAction
jump Script_Menu_ChallengeExplanationCancel
Script_BattleTowerHopeToServeYouAgain:
@@ -157,7 +157,7 @@ Script_BattleTowerHopeToServeYouAgain:
end
UnreferencedScript_0x9e4b6:
special BattleTowerMobileError
special Special_BattleTowerMobileError
closetext
end
@@ -173,8 +173,8 @@ UnreferencedScript_0x9e4be:
special Special_TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ
special BattleTowerAction
special Function1700ba
special Special_BattleTowerAction
special Special_Function1700ba
if_equal $a, Script_Menu_ChallengeExplanationCancel
if_not_equal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
@@ -187,15 +187,15 @@ UnreferencedScript_0x9e4be:
UnreferencedScript_0x9e4ea:
writebyte BATTLETOWERACTION_LEVEL_CHECK
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_APkmnLevelExceeds
writebyte BATTLETOWERACTION_UBERS_CHECK
special BattleTowerAction
special Special_BattleTowerAction
if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70
special SpecialCheckForBattleTowerRules
special Special_CheckForBattleTowerRules
if_not_equal $0, Script_WaitButton
writebyte BATTLETOWERACTION_05
special BattleTowerAction
special Special_BattleTowerAction
if_equal $0, .zero
writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue
@@ -213,9 +213,9 @@ continue:
iffalse Script_Menu_ChallengeExplanationCancel
setscene $1
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_12
special BattleTowerAction
special Special_BattleTowerAction
writetext Text_RightThisWayToYourBattleRoom
waitbutton
jump Script_ResumeBattleTowerChallenge
@@ -236,7 +236,7 @@ Script_MayNotEnterABattleRoomUnderL70: ; 0x9e549
jump Script_Menu_ChallengeExplanationCancel
Script_MobileError:
special BattleTowerMobileError
special Special_BattleTowerMobileError
closetext
end

24
maps/BattleTowerBattleRoom.asm
View File

@@ -23,7 +23,7 @@ Script_BattleRoom: ; 0x9f421
; beat all 7 opponents in a row
Script_BattleRoomLoop: ; 0x9f425
writebyte BATTLETOWERBATTLEROOM_YOUNGSTER
special Function_LoadOpponentTrainerAndPokemonsWithOTSprite
special Special_LoadOpponentTrainerAndPokemonWithOTSprite
appear BATTLETOWERBATTLEROOM_YOUNGSTER
warpsound
waitsfx
@@ -32,7 +32,7 @@ Script_BattleRoomLoop: ; 0x9f425
battletowertext 1
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special Special_BattleTowerBattle ; calls predef startbattle
special Special_FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
@@ -49,7 +49,7 @@ Script_BattleRoomLoop: ; 0x9f425
closetext
playmusic MUSIC_HEAL
special Special_FadeOutPalettes
special LoadMapPalettes
special Special_LoadMapPalettes
pause 60
special Special_FadeInPalettes
special RestartMapMusic
@@ -68,11 +68,11 @@ Script_DontBattleNextOpponent: ; 0x9f483
yesorno
iffalse Script_DontSaveAndEndTheSession
writebyte BATTLETOWERACTION_SAVELEVELGROUP ; save level group
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVEOPTIONS ; choose reward
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_SAVE_AND_QUIT ; quicksave
special BattleTowerAction
special Special_BattleTowerAction
playsound SFX_SAVE
waitsfx
special Special_FadeOutPalettes
@@ -82,9 +82,9 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
yesorno
iffalse Script_ContinueAndBattleNextOpponent
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
closetext
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
@@ -96,7 +96,7 @@ Script_FailedBattleTowerChallenge:
special Special_BattleTowerFade
warpfacing UP, BATTLE_TOWER_1F, $7, $7
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
waitbutton
@@ -114,7 +114,7 @@ Script_BeatenAllTrainers2:
UnreferencedScript_0x9f4eb:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_TooMuchTimeElapsedNoRegister
waitbutton
@@ -123,9 +123,9 @@ UnreferencedScript_0x9f4eb:
UnreferencedScript_0x9f4f7:
writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction
special Special_BattleTowerAction
writebyte BATTLETOWERACTION_06
special BattleTowerAction
special Special_BattleTowerAction
opentext
writetext Text_ThanksForVisiting
writetext Text_WeHopeToServeYouAgain

2
maps/BattleTowerElevator.asm
View File

@@ -22,7 +22,7 @@ BattleTowerElevator_MapScriptHeader:
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn
writebyte BATTLETOWERACTION_0A
special BattleTowerAction
special Special_BattleTowerAction
playsound SFX_ELEVATOR
earthquake 60
waitsfx

4
maps/CeladonMansion3F.asm
View File

@@ -28,7 +28,7 @@ UnknownScript_0x7167e:
waitsfx
writetext UnknownText_0x71760
buttonsound
special Diploma
special Special_Diploma
writetext UnknownText_0x71763
waitbutton
closetext
@@ -49,7 +49,7 @@ UnknownScript_0x716a4:
writetext UnknownText_0x717d8
yesorno
iffalse UnknownScript_0x716b0
special PrintDiploma
special Special_PrintDiploma
closetext
end

4
maps/CeladonPokecenter1F.asm
View File

@@ -30,9 +30,9 @@ CeladonEusine:
writetext CeladonEusineText1
buttonsound
writebyte SUICUNE
special SpecialMonCheck
special Special_MonCheck
iffalse .NoSuicune
special SpecialBeastsCheck
special Special_BeastsCheck
iftrue .HoOh
writetext NoBeastsText
waitbutton

2
maps/CeruleanPokecenter1F.asm
View File

@@ -14,7 +14,7 @@ NurseScript_0x18820f:
jumpstd pokecenternurse
SuperNerdScript_0x188212:
special Mobile_DummyReturnFalse
special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x188221

2
maps/DragonShrine.asm
View File

@@ -217,7 +217,7 @@ ElderScript_0x18d1a5:
waitsfx
givepoke DRATINI, 15
checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
special SpecialDratini
special Special_Dratini
setevent EVENT_GOT_DRATINI
setevent EVENT_JUST_RECEIVED_DRATINI
writetext UnknownText_0x18d6ca

2
maps/EcruteakPokecenter1F.asm
View File

@@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript:
jumpstd pokecenternurse
EcruteakPokecenter1FPokefanMScript:
special Mobile_DummyReturnFalse
special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer EcruteakPokecenter1FPokefanMText

2
maps/ElmsLab.asm
View File

@@ -308,7 +308,7 @@ ElmsLabHealingMachine:
end
ElmsLabHealingMachine_HealParty:
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
writebyte 1 ; Machine is in Elm's Lab

4
maps/FastShipCabins_SW_SSW_NW.asm
View File

@@ -49,7 +49,7 @@ TrainerGuitaristClyde:
.Script:
end_if_just_battled
special Mobile_DummyReturnFalse
special Special_Mobile_DummyReturnFalse
iftrue .mobile
opentext
writetext UnknownText_0x75d65
@@ -71,7 +71,7 @@ FastShipBed:
closetext
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
special HealParty
playmusic MUSIC_HEAL
pause 60

4
maps/GoldenrodPokecenter1F.asm
View File

@@ -17,7 +17,7 @@ NurseScript_0x60f91:
GoldenrodPokecenter1F_GSBallSceneLeft:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
special Special_BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
@@ -49,7 +49,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
GoldenrodPokecenter1F_GSBallSceneRight:
writebyte BATTLETOWERACTION_CHECKMOBILEEVENT
special BattleTowerAction
special Special_BattleTowerAction
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end

2
maps/IlexForest.asm
View File

@@ -472,7 +472,7 @@ MapIlexForestSignpost4Script:
startbattle
reloadmapafterbattle
pause 20
special CheckCaughtCelebi
special Special_CheckCaughtCelebi
iffalse .DidntCatchCelebi
appear ILEXFOREST_KURT
applymovement ILEXFOREST_KURT, MovementData_0x6ef4e

14
maps/MobileBattleRoom.asm
View File

@@ -21,9 +21,9 @@ MobileBattleRoom_MapScriptHeader:
MapMobileBattleRoomSignpost0Script:
refreshscreen $0
special Function1037c2
special Special_Function1037c2
if_equal $1, .one
special Function1037eb
special Special_Function1037eb
iffalse .false
if_equal $1, .one_
if_equal $2, .two_
@@ -35,22 +35,22 @@ MapMobileBattleRoomSignpost0Script:
closetext
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
special Special_LoadMapPalettes
pause 60
special Special_FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
special HealParty
special Function10383c
special Special_Function10383c
iftrue .false
.one
special Function10387b
special Special_Function10387b
writetext MobileBattleRoom_EstablishingCommsText
waitbutton
reloadmappart
special Function101225
special Special_Function101225
.false
closetext
end

4
maps/MobileTradeRoomMobile.asm
View File

@@ -21,11 +21,11 @@ MobileTradeRoomMobile_MapScriptHeader:
MapMobileTradeRoomMobileSignpost0Script:
refreshscreen $0
special Function1037c2
special Special_Function1037c2
writetext MobileTradeRoomMobile_EstablishingCommsText
waitbutton
reloadmappart
special Function101231
special Special_Function101231
closetext
end

2
maps/MrPokemonsHouse.asm
View File

@@ -113,7 +113,7 @@ MrPokemonsHouse_OakScript:
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
playmusic MUSIC_HEAL
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
special HealParty
pause 60
special Special_FadeInQuickly

2
maps/PokeSeersHouse.asm
View File

@@ -11,7 +11,7 @@ PokeSeersHouse_MapScriptHeader:
SeerScript:
faceplayer
opentext
special SpecialPokeSeer
special Special_PokeSeer
waitbutton
closetext
end

20
maps/Pokecenter2F.asm
View File

@@ -76,10 +76,10 @@ LinkReceptionistScript_Trade:
writetext Text_TradeReceptionistIntro
yesorno
iffalse .Cancel
special Mobile_DummyReturnFalse ; always returns false
special Special_Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_TradeReceptionistMobile
special AskMobileOrCable
special Special_AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
@@ -153,7 +153,7 @@ LinkReceptionistScript_Trade:
iffalse .Mobile_DidNotSave
special Special_TryQuickSave
iffalse .Mobile_DidNotSave
special Function1011f1
special Special_Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -178,10 +178,10 @@ LinkReceptionistScript_Battle:
writetext Text_BattleReceptionistIntro
yesorno
iffalse .Cancel
special Mobile_DummyReturnFalse ; always returns false
special Special_Mobile_DummyReturnFalse ; always returns false
iffalse .NoMobile
writetext Text_BattleReceptionistMobile
special AskMobileOrCable
special Special_AskMobileOrCable
iffalse .Cancel
if_equal $1, .Mobile
.NoMobile:
@@ -255,9 +255,9 @@ LinkReceptionistScript_Battle:
writetext Text_MustSaveGame
yesorno
iffalse .Mobile_DidNotSave
special Function103780
special Special_Function103780
iffalse .Mobile_DidNotSave
special Function1011f1
special Special_Function1011f1
writetext Text_PleaseComeIn2
waitbutton
closetext
@@ -271,7 +271,7 @@ LinkReceptionistScript_Battle:
end
.SelectThreeMons:
special Mobile_SelectThreeMons
special Special_Mobile_SelectThreeMons
iffalse .Mobile_DidNotSelect
if_equal $1, .Mobile_OK
if_equal $2, .Mobile_OK
@@ -381,7 +381,7 @@ Script_LeftCableTradeCenter:
end
Script_LeftMobileTradeRoom:
special Function101220
special Special_Function101220
scall Script_WalkOutOfMobileTradeRoom
setscene $0
setmapscene MOBILE_TRADE_ROOM_MOBILE, $0
@@ -401,7 +401,7 @@ Script_LeftCableColosseum:
end
Script_LeftMobileBattleRoom:
special Function101220
special Special_Function101220
scall Script_WalkOutOfMobileBattleRoom
setscene $0
setmapscene MOBILE_BATTLE_ROOM, $0

6
maps/RadioTower2F.asm
View File

@@ -117,7 +117,7 @@ Buena:
if_equal 30, UnknownScript_0x5d87f
playmusic MUSIC_BUENAS_PASSWORD
writetext UnknownText_0x5de35
special AskRememberPassword
special Special_AskRememberPassword
iffalse UnknownScript_0x5d81e
writetext UnknownText_0x5de84
waitbutton
@@ -134,7 +134,7 @@ UnknownScript_0x5d7be:
closetext
spriteface RADIOTOWER2F_BUENA, DOWN
refreshscreen $0
special SpecialBuenasPassword
special Special_BuenasPassword
closetext
iffalse UnknownScript_0x5d845
opentext
@@ -316,7 +316,7 @@ ReceptionistScript_0x5d8ff:
iffalse UnknownScript_0x5d90f
writetext UnknownText_0x5e392
buttonsound
special SpecialBuenaPrize
special Special_BuenaPrize
closetext
end

2
maps/Route26HealSpeechHouse.asm
View File

@@ -16,7 +16,7 @@ TeacherScript_0x7b125:
closetext
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
playmusic MUSIC_HEAL
special HealParty
pause 60

2
maps/Route36.asm
View File

@@ -95,7 +95,7 @@ DidntCatchSudowoodo:
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special Special_MapCallbackSprites_LoadUsedSpritesGFX
special RefreshSprites
special Special_RefreshSprites
end
Route36FloriaScript:

2
maps/Route40.asm
View File

@@ -79,7 +79,7 @@ Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
PokefanMScript_0x1a61c7:
special Mobile_DummyReturnFalse
special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a

2
maps/RuinsOfAlphHoOhChamber.asm
View File

@@ -9,7 +9,7 @@ RuinsOfAlphHoOhChamber_MapScriptHeader:
dbw MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
special SpecialHoOhChamber
special Special_HoOhChamber
checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
iftrue .OpenWall
end

2
maps/RuinsOfAlphOmanyteChamber.asm
View File

@@ -9,7 +9,7 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader:
dbw MAPCALLBACK_TILES, .HiddenDoors
.CheckWall:
special SpecialOmanyteChamber
special Special_OmanyteChamber
checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER
iftrue .OpenWall
end

2
maps/SaffronPokecenter1F.asm
View File

@@ -15,7 +15,7 @@ NurseScript_0x18a47d:
jumpstd pokecenternurse
TeacherScript_0x18a480:
special Mobile_DummyReturnFalse
special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3

2
maps/TeamRocketBaseB2F.asm
View File

@@ -167,7 +167,7 @@ LanceHealsCommon:
waitbutton
closetext
special Special_FadeOutPalettes
special TrainerRankings_Healings
special Special_TrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
special Special_FadeInPalettes

10
maps/TinTower1F.asm
View File

@@ -33,7 +33,7 @@ TinTower1F_MapScriptHeader:
iftrue .GotRainbowWing
checkevent EVENT_BEAT_ELITE_FOUR
iffalse .FaceBeasts
special SpecialBeastsCheck
special Special_BeastsCheck
iffalse .FaceBeasts
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
@@ -49,7 +49,7 @@ TinTower1F_MapScriptHeader:
iftrue .FoughtSuicune
appear TINTOWER1F_SUICUNE
writebyte RAIKOU
special SpecialMonCheck
special Special_MonCheck
iftrue .NoRaikou
appear TINTOWER1F_RAIKOU
jump .CheckEntei
@@ -58,7 +58,7 @@ TinTower1F_MapScriptHeader:
disappear TINTOWER1F_RAIKOU
.CheckEntei:
writebyte ENTEI
special SpecialMonCheck
special Special_MonCheck
iftrue .NoEntei
appear TINTOWER1F_ENTEI
jump .BeastsDone
@@ -87,7 +87,7 @@ TinTower1F_MapScriptHeader:
applymovement PLAYER, TinTowerPlayerMovement1
pause 15
writebyte RAIKOU
special SpecialMonCheck
special Special_MonCheck
iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
spriteface PLAYER, LEFT
@@ -100,7 +100,7 @@ TinTower1F_MapScriptHeader:
waitsfx
.Next1:
writebyte ENTEI
special SpecialMonCheck
special Special_MonCheck
iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
spriteface PLAYER, RIGHT