You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -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 FALSE, 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 USE_SCRIPT_VAR, MEM_BUFFER_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 FALSE, 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
|
||||
|
||||
|
||||
@@ -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,8 +32,8 @@ Script_BattleRoomLoop: ; 0x9f425
|
||||
battletowertext BATTLETOWERTEXT_INTRO
|
||||
buttonsound
|
||||
closetext
|
||||
special BattleTowerBattle ; calls predef startbattle
|
||||
special FadeOutPalettes
|
||||
special Special_BattleTowerBattle ; calls predef startbattle
|
||||
special Special_FadeOutPalettes
|
||||
reloadmap
|
||||
if_not_equal $0, Script_FailedBattleTowerChallenge
|
||||
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
|
||||
@@ -48,10 +48,10 @@ Script_BattleRoomLoop: ; 0x9f425
|
||||
waitbutton
|
||||
closetext
|
||||
playmusic MUSIC_HEAL
|
||||
special FadeOutPalettes
|
||||
special LoadMapPalettes
|
||||
special Special_FadeOutPalettes
|
||||
special Special_LoadMapPalettes
|
||||
pause 60
|
||||
special FadeInPalettes
|
||||
special Special_FadeInPalettes
|
||||
special RestartMapMusic
|
||||
opentext
|
||||
writetext Text_NextUpOpponentNo
|
||||
@@ -68,25 +68,25 @@ 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 FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
special Reset
|
||||
Script_DontSaveAndEndTheSession: ; 0x9f4a3
|
||||
writetext Text_CancelYourBattleRoomChallenge
|
||||
yesorno
|
||||
iffalse Script_ContinueAndBattleNextOpponent
|
||||
writebyte BATTLETOWERACTION_CHALLENGECANCELED
|
||||
special BattleTowerAction
|
||||
special Special_BattleTowerAction
|
||||
writebyte BATTLETOWERACTION_06
|
||||
special BattleTowerAction
|
||||
special Special_BattleTowerAction
|
||||
closetext
|
||||
special FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
warpfacing UP, BATTLE_TOWER_1F, 7, 7
|
||||
opentext
|
||||
jump Script_BattleTowerHopeToServeYouAgain
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -33,14 +33,14 @@ DaisyScript:
|
||||
writetext DaisyAlrightText
|
||||
waitbutton
|
||||
closetext
|
||||
special FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
playmusic MUSIC_HEAL
|
||||
pause 60
|
||||
special FadeInPalettes
|
||||
special Special_FadeInPalettes
|
||||
special RestartMapMusic
|
||||
opentext
|
||||
writetext GroomedMonLooksContentText
|
||||
special PlayCurMonCry
|
||||
special Special_PlayCurMonCry
|
||||
buttonsound
|
||||
writetext DaisyAllDoneText
|
||||
waitbutton
|
||||
|
||||
@@ -83,7 +83,7 @@ ReleaseTheBeasts:
|
||||
special RestartMapMusic
|
||||
setscene 1
|
||||
setevent EVENT_RELEASED_THE_BEASTS
|
||||
special InitRoamMons
|
||||
special Special_InitRoamMons
|
||||
setmapscene ECRUTEAK_GYM, 1
|
||||
setmapscene CIANWOOD_CITY, 1
|
||||
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
|
||||
|
||||
@@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine:
|
||||
opentext
|
||||
writetext CeladonVendingText
|
||||
.Start:
|
||||
special PlaceMoneyTopRight
|
||||
special Special_PlaceMoneyTopRight
|
||||
loadmenudata .MenuData
|
||||
verticalmenu
|
||||
closewindow
|
||||
|
||||
@@ -144,7 +144,7 @@ MapCeladonGameCornerSignpost9Script:
|
||||
end
|
||||
|
||||
MovementData_0x721cd:
|
||||
; Unreferenced.
|
||||
; unused
|
||||
step RIGHT
|
||||
turn_head LEFT
|
||||
step_end
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -14,7 +14,7 @@ NurseScript_0x18820f:
|
||||
jumpstd pokecenternurse
|
||||
|
||||
SuperNerdScript_0x188212:
|
||||
special Mobile_DummyReturnFalse
|
||||
special Special_Mobile_DummyReturnFalse
|
||||
iftrue .mobile
|
||||
jumptextfaceplayer UnknownText_0x188221
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0:
|
||||
iffalse UnknownScript_0x9e0f3
|
||||
writetext UnknownText_0x9e142
|
||||
waitbutton
|
||||
special PhotoStudio
|
||||
special Special_PhotoStudio
|
||||
waitbutton
|
||||
closetext
|
||||
end
|
||||
|
||||
@@ -46,7 +46,7 @@ Copycat:
|
||||
faceplayer
|
||||
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
|
||||
.Default_Merge_1:
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
checkevent EVENT_RETURNED_MACHINE_PART
|
||||
iftrue .TalkAboutLostItem
|
||||
opentext
|
||||
@@ -70,7 +70,7 @@ Copycat:
|
||||
.Default_Merge_3a:
|
||||
faceplayer
|
||||
variablesprite SPRITE_COPYCAT, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
opentext
|
||||
writetext CopycatText_QuickMimicking
|
||||
waitbutton
|
||||
@@ -99,7 +99,7 @@ Copycat:
|
||||
.Default_Merge_3b:
|
||||
faceplayer
|
||||
variablesprite SPRITE_COPYCAT, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
opentext
|
||||
writetext CopycatText_Worried
|
||||
waitbutton
|
||||
@@ -142,7 +142,7 @@ Copycat:
|
||||
faceplayer
|
||||
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
|
||||
.GotPass_Merge_1:
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
opentext
|
||||
checkflag ENGINE_PLAYER_IS_FEMALE
|
||||
iftrue .GotPass_Female_2
|
||||
@@ -164,7 +164,7 @@ Copycat:
|
||||
.GotPass_Merge_3:
|
||||
faceplayer
|
||||
variablesprite SPRITE_COPYCAT, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
opentext
|
||||
writetext CopycatText_ItsAScream
|
||||
waitbutton
|
||||
|
||||
@@ -217,7 +217,7 @@ DragonShrineElder1Script:
|
||||
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 DragonShrineSymbolicDragonText
|
||||
|
||||
@@ -91,7 +91,7 @@ EcruteakGymClosed:
|
||||
follow PLAYER, ECRUTEAKGYM_GRAMPS
|
||||
applymovement PLAYER, MovementData_0x99e5f
|
||||
stopfollow
|
||||
special FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
playsound SFX_ENTER_DOOR
|
||||
waitsfx
|
||||
warp ECRUTEAK_CITY, 6, 27
|
||||
|
||||
@@ -61,7 +61,7 @@ EcruteakPokecenter1FNurseScript:
|
||||
jumpstd pokecenternurse
|
||||
|
||||
EcruteakPokecenter1FPokefanMScript:
|
||||
special Mobile_DummyReturnFalse
|
||||
special Special_Mobile_DummyReturnFalse
|
||||
iftrue .mobile
|
||||
jumptextfaceplayer EcruteakPokecenter1FPokefanMText
|
||||
|
||||
|
||||
@@ -308,11 +308,11 @@ ElmsLabHealingMachine:
|
||||
end
|
||||
|
||||
ElmsLabHealingMachine_HealParty:
|
||||
special TrainerRankings_Healings
|
||||
special Special_StubbedTrainerRankings_Healings
|
||||
special HealParty
|
||||
playmusic MUSIC_NONE
|
||||
writebyte HEALMACHINE_ELMS_LAB
|
||||
special HealMachineAnim
|
||||
special Special_HealMachineAnim
|
||||
pause 30
|
||||
special RestartMapMusic
|
||||
closetext
|
||||
@@ -556,7 +556,7 @@ CopScript:
|
||||
opentext
|
||||
writetext ElmsLabOfficerText1
|
||||
buttonsound
|
||||
special SpecialNameRival
|
||||
special Special_NameRival
|
||||
writetext ElmsLabOfficerText2
|
||||
waitbutton
|
||||
closetext
|
||||
|
||||
@@ -68,7 +68,7 @@ SailorScript_0x75160:
|
||||
closetext
|
||||
scall .LetThePlayerOut
|
||||
playsound SFX_EXIT_BUILDING
|
||||
special FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
waitsfx
|
||||
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
|
||||
setmapscene VERMILION_PORT, 1
|
||||
@@ -81,7 +81,7 @@ SailorScript_0x75160:
|
||||
closetext
|
||||
scall .LetThePlayerOut
|
||||
playsound SFX_EXIT_BUILDING
|
||||
special FadeOutPalettes
|
||||
special Special_FadeOutPalettes
|
||||
waitsfx
|
||||
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
|
||||
setmapscene OLIVINE_PORT, 1
|
||||
|
||||
@@ -18,7 +18,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScriptHeader:
|
||||
.MapCallbacks:
|
||||
db 0
|
||||
|
||||
Unused_0x75ea6:
|
||||
Unreferenced_0x75ea6:
|
||||
end
|
||||
|
||||
SSAquaCaptain:
|
||||
@@ -49,7 +49,7 @@ SSAquaGranddaughterBefore:
|
||||
waitbutton
|
||||
closetext
|
||||
special Special_FadeBlackQuickly
|
||||
special Special_ReloadSpritesNoPalettes
|
||||
special ReloadSpritesNoPalettes
|
||||
disappear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2
|
||||
applymovement PLAYER, MovementData_0x76004
|
||||
moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
|
||||
|
||||
@@ -49,7 +49,7 @@ TrainerGuitaristClyde:
|
||||
|
||||
.Script:
|
||||
end_if_just_battled
|
||||
special Mobile_DummyReturnFalse
|
||||
special Special_Mobile_DummyReturnFalse
|
||||
iftrue .mobile
|
||||
opentext
|
||||
writetext UnknownText_0x75d65
|
||||
@@ -70,8 +70,8 @@ FastShipBed:
|
||||
waitbutton
|
||||
closetext
|
||||
special Special_FadeBlackQuickly
|
||||
special Special_ReloadSpritesNoPalettes
|
||||
special TrainerRankings_Healings
|
||||
special ReloadSpritesNoPalettes
|
||||
special Special_StubbedTrainerRankings_Healings
|
||||
special HealParty
|
||||
playmusic MUSIC_HEAL
|
||||
pause 60
|
||||
|
||||
@@ -35,7 +35,7 @@ FuchsiaGymJanineScript:
|
||||
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
|
||||
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
|
||||
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
opentext
|
||||
writetext Text_ReceivedSoulBadge
|
||||
playsound SFX_GET_BADGE
|
||||
@@ -65,7 +65,7 @@ LassAliceScript:
|
||||
applymovement FUCHSIAGYM_FUCHSIA_GYM_1, Movement_NinjaSpin
|
||||
faceplayer
|
||||
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
.AliceUnmasked:
|
||||
faceplayer
|
||||
opentext
|
||||
@@ -99,7 +99,7 @@ LassLindaScript:
|
||||
applymovement FUCHSIAGYM_FUCHSIA_GYM_2, Movement_NinjaSpin
|
||||
faceplayer
|
||||
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
.LindaUnmasked:
|
||||
faceplayer
|
||||
opentext
|
||||
@@ -133,7 +133,7 @@ PicnickerCindyScript:
|
||||
applymovement FUCHSIAGYM_FUCHSIA_GYM_3, Movement_NinjaSpin
|
||||
faceplayer
|
||||
variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
.CindyUnmasked:
|
||||
faceplayer
|
||||
opentext
|
||||
@@ -167,7 +167,7 @@ CamperBarryScript:
|
||||
applymovement FUCHSIAGYM_FUCHSIA_GYM_4, Movement_NinjaSpin
|
||||
faceplayer
|
||||
variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
|
||||
special MapCallbackSprites_LoadUsedSpritesGFX
|
||||
special Special_LoadUsedSpritesGFX
|
||||
.BarryUnmasked:
|
||||
faceplayer
|
||||
opentext
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user