pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

* loadmenuheader -> loadmenu (ead103d)

Browse Source 
* objectface -> turnobject (c834bda)
This commit is contained in:
Rangi
2018-02-25 20:05:37 -05:00
parent be28a0ff4e
commit f964d04a87
86 changed files with 351 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
maps/AzaleaTown.asm
View File

@@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
jump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2:
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
objectface PLAYER, UP
turnobject PLAYER, UP
AzaleaTownRivalBattleScript:
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
writetext AzaleaTownRivalAfterText
waitbutton
closetext
objectface PLAYER, LEFT
turnobject PLAYER, LEFT
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
@@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
opentext
writetext AzaleaTownKurtText1
buttonsound
objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
turnobject AZALEATOWN_KURT_OUTSIDE, RIGHT
writetext AzaleaTownKurtText2
buttonsound
writetext AzaleaTownKurtText3
waitbutton
verbosegiveitem GS_BALL
objectface AZALEATOWN_KURT_OUTSIDE, LEFT
turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
@@ -177,7 +177,7 @@ AzaleaTownKurtScript:
opentext
writetext AzaleaTownKurtText3
waitbutton
objectface AZALEATOWN_KURT_OUTSIDE, LEFT
turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
closetext
end

6
maps/BattleTower1F.asm
View File

@@ -176,10 +176,10 @@ UnreferencedScript_0x9e4be:
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
objectface BATTLETOWER1F_RECEPTIONIST, LEFT
turnobject BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
waitbutton
objectface BATTLETOWER1F_RECEPTIONIST, DOWN
turnobject BATTLETOWER1F_RECEPTIONIST, DOWN
closetext
end
@@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
writetext Text_BattleTowerYoungster
waitbutton
closetext
objectface BATTLETOWER1F_YOUNGSTER, RIGHT
turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
end
CooltrainerFScript_0x9e568:

4
maps/BurnedTower1F.asm
View File

@@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
return
.MeetEusine:
objectface BURNEDTOWER1F_EUSINE, DOWN
turnobject BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
opentext
@@ -51,7 +51,7 @@ BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
special FadeOutMusic
pause 15
objectface BURNEDTOWER1F_SILVER, RIGHT
turnobject BURNEDTOWER1F_SILVER, RIGHT
pause 15
applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer

18
maps/BurnedTowerB1F.asm
View File

@@ -34,48 +34,48 @@ ReleaseTheBeasts:
playmusic MUSIC_NONE
pause 30
appear BURNEDTOWERB1F_RAIKOU1
objectface PLAYER, UP
turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_RAIKOU2
pause 15
cry RAIKOU
appear BURNEDTOWERB1F_ENTEI1
objectface PLAYER, UP
turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_ENTEI2
pause 15
cry ENTEI
appear BURNEDTOWERB1F_SUICUNE1
objectface PLAYER, UP
turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_SUICUNE2
pause 15
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
objectface PLAYER, LEFT
turnobject PLAYER, LEFT
applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
disappear BURNEDTOWERB1F_RAIKOU1
waitsfx
playsound SFX_WARP_FROM
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
disappear BURNEDTOWERB1F_ENTEI1
waitsfx
pause 15
playsound SFX_WARP_FROM
objectface PLAYER, UP
turnobject PLAYER, UP
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
playsound SFX_WARP_FROM
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
objectface PLAYER, UP
turnobject PLAYER, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic

12
maps/CeladonCafe.asm
View File

@@ -28,7 +28,7 @@ CeladonCafeFisher1:
writetext Fisher1Text_Concentration
waitbutton
closetext
objectface CELADONCAFE_FISHER1, LEFT
turnobject CELADONCAFE_FISHER1, LEFT
end
CeladonCafeFisher2:
@@ -41,7 +41,7 @@ CeladonCafeFisher2:
writetext Fisher2Text_Quantity
waitbutton
closetext
objectface CELADONCAFE_FISHER2, RIGHT
turnobject CELADONCAFE_FISHER2, RIGHT
end
CeladonCafeFisher3:
@@ -54,7 +54,7 @@ CeladonCafeFisher3:
writetext Fisher3Text_GoldenrodIsBest
waitbutton
closetext
objectface CELADONCAFE_FISHER3, RIGHT
turnobject CELADONCAFE_FISHER3, RIGHT
end
CeladonCafeTeacher:
@@ -69,7 +69,7 @@ CeladonCafeTeacher:
writetext TeacherText_NoCoinCase
waitbutton
closetext
objectface CELADONCAFE_TEACHER, LEFT
turnobject CELADONCAFE_TEACHER, LEFT
end
.HasCoinCase:
@@ -77,12 +77,12 @@ CeladonCafeTeacher:
writetext TeacherText_KeepEating
waitbutton
closetext
objectface CELADONCAFE_TEACHER, RIGHT
turnobject CELADONCAFE_TEACHER, RIGHT
opentext
writetext TeacherText_MoreChef
waitbutton
closetext
objectface CELADONCAFE_TEACHER, LEFT
turnobject CELADONCAFE_TEACHER, LEFT
end
EatathonContestPoster:

4
maps/CeladonDeptStore3F.asm
View File

@@ -26,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
writetext CeladonDeptStore3FGameboyKid1Text
waitbutton
closetext
objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
turnobject CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
end
CeladonDeptStore3FGameboyKid2Script:
@@ -35,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
writetext CeladonDeptStore3FGameboyKid2Text
waitbutton
closetext
objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
turnobject CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
end
CeladonDeptStore3FSuperNerdScript:

2
maps/CeladonDeptStore6F.asm
View File

@@ -23,7 +23,7 @@ CeladonDeptStore6FVendingMachine:
writetext CeladonVendingText
.Start:
special PlaceMoneyTopRight
loadmenuheader .MenuHeader
loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .FreshWater

14
maps/CeladonGameCorner.asm
View File

@@ -26,7 +26,7 @@ CeladonGameCornerPokefanMScript:
writetext CeladonGameCornerPokefanMText
waitbutton
closetext
objectface CELADONGAMECORNER_POKEFAN_M, LEFT
turnobject CELADONGAMECORNER_POKEFAN_M, LEFT
end
CeladonGameCornerTeacherScript:
@@ -35,7 +35,7 @@ CeladonGameCornerTeacherScript:
writetext CeladonGameCornerTeacherText
waitbutton
closetext
objectface CELADONGAMECORNER_TEACHER, RIGHT
turnobject CELADONGAMECORNER_TEACHER, RIGHT
end
CeladonGameCornerFishingGuruScript:
@@ -44,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
writetext CeladonGameCornerFishingGuruText
waitbutton
closetext
objectface CELADONGAMECORNER_FISHING_GURU, RIGHT
turnobject CELADONGAMECORNER_FISHING_GURU, RIGHT
end
CeladonGameCornerFisherScript:
@@ -66,7 +66,7 @@ CeladonGameCornerFisherScript:
writetext CeladonGameCornerFisherText2
waitbutton
closetext
objectface LAST_TALKED, LEFT
turnobject LAST_TALKED, LEFT
end
.GiveCoins:
@@ -80,14 +80,14 @@ CeladonGameCornerFisherScript:
writetext CeladonGameCornerFisherNoCoinCaseText
waitbutton
closetext
objectface LAST_TALKED, LEFT
turnobject LAST_TALKED, LEFT
end
.FullCoinCase:
writetext CeladonGameCornerFisherFullCoinCaseText
waitbutton
closetext
objectface LAST_TALKED, LEFT
turnobject LAST_TALKED, LEFT
end
CeladonGymGuyScript:
@@ -99,7 +99,7 @@ CeladonGameCornerGrampsScript:
writetext CeladonGameCornerGrampsText
waitbutton
closetext
objectface CELADONGAMECORNER_GRAMPS, LEFT
turnobject CELADONGAMECORNER_GRAMPS, LEFT
end
CeladonGameCornerPoster1Script:

4
maps/CeladonGameCornerPrizeRoom.asm
View File

@@ -23,7 +23,7 @@ CeladonGameCornerPrizeRoomTMVendor:
writetext CeladonPrizeRoom_AskWhichPrizeText
CeladonPrizeRoom_tmcounterloop:
special DisplayCoinCaseBalance
loadmenuheader CeladonPrizeRoom_TMMenuHeader
loadmenu CeladonPrizeRoom_TMMenuHeader
verticalmenu
closewindow
ifequal 1, .doubleteam
@@ -124,7 +124,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.loop
writetext CeladonPrizeRoom_AskWhichPrizeText
special DisplayCoinCaseBalance
loadmenuheader .MenuHeader
loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .pikachu

4
maps/CeruleanCity.asm
View File

@@ -49,7 +49,7 @@ CeruleanCityCooltrainerFScript:
writetext CeruleanCityCooltrainerFText1
waitbutton
closetext
objectface CERULEANCITY_COOLTRAINER_F, LEFT
turnobject CERULEANCITY_COOLTRAINER_F, LEFT
opentext
writetext CeruleanCityCooltrainerFText2
waitbutton
@@ -113,7 +113,7 @@ CeruleanCityYoungsterScript:
playsound SFX_TRANSACTION
waitsfx
showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
objectface CERULEANCITY_YOUNGSTER, LEFT
turnobject CERULEANCITY_YOUNGSTER, LEFT
opentext
writetext CeruleanCityYoungsterText2
waitbutton

2
maps/CeruleanGym.asm
View File

@@ -52,7 +52,7 @@ CeruleanGym_MapScripts:
waitsfx
special RestartMapMusic
pause 15
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
pause 15
end

20
maps/CherrygroveCity.asm
View File

@@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
objectface PLAYER, UP
turnobject PLAYER, UP
opentext
writetext GuideGentMartText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
objectface PLAYER, UP
turnobject PLAYER, UP
opentext
writetext GuideGentRoute30Text
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
objectface PLAYER, LEFT
turnobject PLAYER, LEFT
opentext
writetext GuideGentSeaText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
objectface PLAYER, UP
turnobject PLAYER, UP
pause 60
objectface CHERRYGROVECITY_GRAMPS, LEFT
objectface PLAYER, RIGHT
turnobject CHERRYGROVECITY_GRAMPS, LEFT
turnobject PLAYER, RIGHT
opentext
writetext GuideGentGiftText
buttonsound
@@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
closetext
stopfollow
special RestartMapMusic
objectface PLAYER, UP
turnobject PLAYER, UP
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
playsound SFX_ENTER_DOOR
disappear CHERRYGROVECITY_GRAMPS
@@ -101,13 +101,13 @@ CherrygroveCityGuideGent:
CherrygroveSilverSceneSouth:
moveobject CHERRYGROVECITY_SILVER, 39, 7
CherrygroveSilverSceneNorth:
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear CHERRYGROVECITY_SILVER
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext UnknownText_0x19c4e2
@@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
.FinishRival:
playsound SFX_TACKLE
applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
objectface PLAYER, LEFT
turnobject PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
setscene SCENE_CHERRYGROVECITY_NOTHING

4
maps/CianwoodCity.asm
View File

@@ -36,12 +36,12 @@ CianwoodCity_MapScripts:
return
CianwoodCitySuicuneAndEusine:
objectface PLAYER, UP
turnobject PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
pause 15
playsound SFX_WARP_FROM
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0

2
maps/CianwoodGym.asm
View File

@@ -22,7 +22,7 @@ ChuckScript_0x9d60f:
writetext ChuckIntroText1
waitbutton
closetext
objectface CIANWOODGYM_CHUCK, RIGHT
turnobject CIANWOODGYM_CHUCK, RIGHT
opentext
writetext ChuckIntroText2
waitbutton

28
maps/DragonShrine.asm
View File

@@ -28,7 +28,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
writetext DragonShrineQuestion1Text
buttonsound
loadmenuheader DragonShrineQuestion1_MenuHeader
loadmenu DragonShrineQuestion1_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -40,7 +40,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
writetext DragonShrineQuestion2Text
buttonsound
loadmenuheader DragonShrineQuestion2_MenuHeader
loadmenu DragonShrineQuestion2_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -50,7 +50,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
writetext DragonShrineQuestion3Text
buttonsound
loadmenuheader DragonShrineQuestion3_MenuHeader
loadmenu DragonShrineQuestion3_MenuHeader
verticalmenu
closewindow
ifequal 1, .WrongAnswer
@@ -60,7 +60,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
writetext DragonShrineQuestion4Text
buttonsound
loadmenuheader DragonShrineQuestion4_MenuHeader
loadmenu DragonShrineQuestion4_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -70,7 +70,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
writetext DragonShrineQuestion5Text
buttonsound
loadmenuheader DragonShrineQuestion5_MenuHeader
loadmenu DragonShrineQuestion5_MenuHeader
verticalmenu
closewindow
ifequal 1, .WrongAnswer
@@ -91,12 +91,12 @@ DragonShrine_MapScripts:
iftrue .Question2
.WrongAnswer:
closetext
objectface DRAGONSHRINE_ELDER1, LEFT
turnobject DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineWrongAnswerText1
waitbutton
closetext
objectface DRAGONSHRINE_ELDER1, DOWN
turnobject DRAGONSHRINE_ELDER1, DOWN
opentext
writetext DragonShrineWrongAnswerText2
waitbutton
@@ -122,12 +122,12 @@ DragonShrine_MapScripts:
playmusic MUSIC_CLAIR
appear DRAGONSHRINE_CLAIR
waitsfx
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
pause 30
applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
objectface DRAGONSHRINE_CLAIR, RIGHT
objectface PLAYER, LEFT
objectface DRAGONSHRINE_ELDER1, LEFT
turnobject DRAGONSHRINE_CLAIR, RIGHT
turnobject PLAYER, LEFT
turnobject DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineClairYouPassedText
waitbutton
@@ -144,7 +144,7 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
objectface DRAGONSHRINE_CLAIR, UP
turnobject DRAGONSHRINE_CLAIR, UP
opentext
writetext DragonShrineMustIInformLanceText
waitbutton
@@ -171,9 +171,9 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
objectface DRAGONSHRINE_CLAIR, UP
turnobject DRAGONSHRINE_CLAIR, UP
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
objectface PLAYER, UP
turnobject PLAYER, UP
opentext
writetext DragonShrineElderScoldsClairText
waitbutton

2
maps/DragonsDenB1F.asm
View File

@@ -47,7 +47,7 @@ DragonsDenB1F_ClairScene:
pause 30
closetext
showemote EMOTE_SHOCK, PLAYER, 15
objectface PLAYER, LEFT
turnobject PLAYER, LEFT
playmusic MUSIC_CLAIR
applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
opentext

6
maps/EarlsPokemonAcademy.asm
View File

@@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
writetext EarlsPokemonAcademyGameboyKid1Text
waitbutton
closetext
objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
end
EarlsPokemonAcademyGameboyKid2Script:
@@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
writetext EarlsPokemonAcademyGameboyKid2Text
waitbutton
closetext
objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
end
EarlsPokemonAcademyYoungster2Script:
@@ -64,7 +64,7 @@ AcademyBlackboard:
opentext
writetext AcademyBlackboardText
.Loop:
loadmenuheader .BlackboardMenuHeader
loadmenu .BlackboardMenuHeader
_2dmenu
closewindow
ifequal 1, .Poison

12
maps/EcruteakPokecenter1F.asm
View File

@@ -26,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
waitsfx
applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
objectface ECRUTEAKPOKECENTER1F_NURSE, UP
turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
pause 10
objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
pause 30
objectface ECRUTEAKPOKECENTER1F_NURSE, UP
turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
pause 10
objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
pause 20
objectface ECRUTEAKPOKECENTER1F_BILL, DOWN
turnobject ECRUTEAKPOKECENTER1F_BILL, DOWN
pause 10
opentext
writetext EcruteakPokecenter1F_BillText1
@@ -45,7 +45,7 @@ EcruteakPokecenter1F_MapScripts:
writetext EcruteakPokecenter1F_BillText2
waitbutton
closetext
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
playsound SFX_EXIT_BUILDING
disappear ECRUTEAKPOKECENTER1F_BILL

34
maps/ElmsLab.asm
View File

@@ -47,7 +47,7 @@ ElmsLab_MapScripts:
.WalkUpToElm:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
objectface ELMSLAB_ELM, RIGHT
turnobject ELMSLAB_ELM, RIGHT
opentext
writetext ElmText_Intro
.MustSayYes:
@@ -65,20 +65,20 @@ ElmsLab_MapScripts:
playsound SFX_GLASS_TING
pause 30
showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
opentext
writetext ElmText_GotAnEmail
waitbutton
closetext
opentext
objectface ELMSLAB_ELM, RIGHT
turnobject ELMSLAB_ELM, RIGHT
writetext ElmText_MissionFromMrPokemon
waitbutton
closetext
applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
objectface PLAYER, UP
turnobject PLAYER, UP
applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
opentext
writetext ElmText_ChooseAPokemon
waitbutton
@@ -147,7 +147,7 @@ ElmCheckGotEggAgain:
end
LabTryToLeaveScript:
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
opentext
writetext LabWhereGoingText
waitbutton
@@ -158,7 +158,7 @@ LabTryToLeaveScript:
CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic CYNDAQUIL
cry CYNDAQUIL
@@ -188,7 +188,7 @@ CyndaquilPokeBallScript:
TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic TOTODILE
cry TOTODILE
@@ -216,7 +216,7 @@ TotodilePokeBallScript:
ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic CHIKORITA
cry CHIKORITA
@@ -248,7 +248,7 @@ DidntChooseStarterScript:
end
ElmDirectionsScript:
objectface PLAYER, UP
turnobject PLAYER, UP
opentext
writetext ElmDirectionsText1
waitbutton
@@ -260,12 +260,12 @@ ElmDirectionsScript:
waitsfx
waitbutton
closetext
objectface ELMSLAB_ELM, LEFT
turnobject ELMSLAB_ELM, LEFT
opentext
writetext ElmDirectionsText2
waitbutton
closetext
objectface ELMSLAB_ELM, DOWN
turnobject ELMSLAB_ELM, DOWN
opentext
writetext ElmDirectionsText3
waitbutton
@@ -457,14 +457,14 @@ ElmJumpRightScript:
AideScript_WalkPotion1:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
end
AideScript_WalkPotion2:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
end
@@ -482,14 +482,14 @@ AideScript_GivePotion:
AideScript_WalkBalls1:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
end
AideScript_WalkBalls2:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
objectface PLAYER, DOWN
turnobject PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
end
@@ -550,7 +550,7 @@ MeetCopScript2:
MeetCopScript:
applymovement PLAYER, MeetCopScript_WalkUp
CopScript:
objectface ELMSLAB_OFFICER, LEFT
turnobject ELMSLAB_OFFICER, LEFT
opentext
writetext ElmsLabOfficerText1
buttonsound

2
maps/FastShip1F.asm
View File

@@ -130,7 +130,7 @@ WorriedGrandpaSceneLeft:
writetext UnknownText_0x75412
waitbutton
closetext
objectface PLAYER, RIGHT
turnobject PLAYER, RIGHT
applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
disappear FASTSHIP1F_GENTLEMAN
setscene SCENE_DEFAULT

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