pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/event_commands.md
View File

@ -163,7 +163,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$4E`: `yesorno` ## `$4E`: `yesorno`
## `$4F`: <code>loadmenuheader <i>menu_header</i></code> ## `$4F`: <code>loadmenu <i>menu_header</i></code>
## `$50`: `closewindow` ## `$50`: `closewindow`
@ -241,7 +241,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$75`: <code>showemote <i>emote_id</i>, <i>object_id</i>, <i>length</i></code> ## `$75`: <code>showemote <i>emote_id</i>, <i>object_id</i>, <i>length</i></code>
## `$76`: <code>objectface <i>object_id</i>, <i>facing</i></code> ## `$76`: <code>turnobject <i>object_id</i>, <i>facing</i></code>
## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code> ## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code>

10
engine/events/std_scripts.asm
View File

@ -109,7 +109,7 @@ PokecenterNurseScript:
farwritetext NurseTakePokemonText farwritetext NurseTakePokemonText
pause 20 pause 20
special StubbedTrainerRankings_Healings special StubbedTrainerRankings_Healings
objectface LAST_TALKED, LEFT turnobject LAST_TALKED, LEFT
pause 10 pause 10
special HealParty special HealParty
playmusic MUSIC_NONE playmusic MUSIC_NONE
@ -117,7 +117,7 @@ PokecenterNurseScript:
special HealMachineAnim special HealMachineAnim
pause 30 pause 30
special RestartMapMusic special RestartMapMusic
objectface LAST_TALKED, DOWN turnobject LAST_TALKED, DOWN
pause 10 pause 10
checkphonecall ; elm already called about pokerus checkphonecall ; elm already called about pokerus
@ -134,9 +134,9 @@ PokecenterNurseScript:
.done .done
farwritetext NurseGoodbyeText farwritetext NurseGoodbyeText
objectface LAST_TALKED, UP turnobject LAST_TALKED, UP
pause 10 pause 10
objectface LAST_TALKED, DOWN turnobject LAST_TALKED, DOWN
pause 10 pause 10
waitbutton waitbutton
@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0
.loop ; 0xbcde4 .loop ; 0xbcde4
special DisplayMoneyAndCoinBalance special DisplayMoneyAndCoinBalance
loadmenuheader .MenuHeader loadmenu .MenuHeader
verticalmenu verticalmenu
closewindow closewindow
ifequal 1, .Buy50 ifequal 1, .Buy50

8
engine/scripting.asm
View File

@ -144,7 +144,7 @@ ScriptCommandTable:
dw Script_writetext ; 4c dw Script_writetext ; 4c
dw Script_repeattext ; 4d dw Script_repeattext ; 4d
dw Script_yesorno ; 4e dw Script_yesorno ; 4e
dw Script_loadmenuheader ; 4f dw Script_loadmenu ; 4f
dw Script_closewindow ; 50 dw Script_closewindow ; 50
dw Script_jumptextfaceplayer ; 51 dw Script_jumptextfaceplayer ; 51
if _CRYSTAL if _CRYSTAL
@ -185,7 +185,7 @@ endc
dw Script_writeobjectxy ; 73 dw Script_writeobjectxy ; 73
dw Script_loademote ; 74 dw Script_loademote ; 74
dw Script_showemote ; 75 dw Script_showemote ; 75
dw Script_objectface ; 76 dw Script_turnobject ; 76
dw Script_follownotexact ; 77 dw Script_follownotexact ; 77
dw Script_earthquake ; 78 dw Script_earthquake ; 78
dw Script_changemap ; 79 dw Script_changemap ; 79
@ -432,7 +432,7 @@ Script_yesorno:
ld [wScriptVar], a ld [wScriptVar], a
ret ret
Script_loadmenuheader: Script_loadmenu:
; script command 0x4f ; script command 0x4f
; parameters: menu_header ; parameters: menu_header
@ -1052,7 +1052,7 @@ Script_faceobject:
call ApplyObjectFacing call ApplyObjectFacing
ret ret
Script_objectface: Script_turnobject:
; script command 0x76 ; script command 0x76
; parameters: object_id, facing ; parameters: object_id, facing

7
macros/legacy.asm
View File

@ -25,14 +25,17 @@ checkmaptriggers EQUS "checkmapscene"
domaptrigger EQUS "setmapscene" domaptrigger EQUS "setmapscene"
checktriggers EQUS "checkscene" checktriggers EQUS "checkscene"
dotrigger EQUS "setscene" dotrigger EQUS "setscene"
faceperson EQUS "faceobject" faceperson EQUS "faceobject"
moveperson EQUS "moveobject" moveperson EQUS "moveobject"
writepersonxy EQUS "writeobjectxy" writepersonxy EQUS "writeobjectxy"
spriteface EQUS "objectface" spriteface EQUS "turnobject"
objectface EQUS "turnobject"
RAM2MEM EQUS "vartomem" RAM2MEM EQUS "vartomem"
loadfont EQUS "opentext" loadfont EQUS "opentext"
loadmenudata EQUS "loadmenuheader" loadmenudata EQUS "loadmenu"
loadmenuheader EQUS "loadmenu"
writebackup EQUS "closewindow" writebackup EQUS "closewindow"
interpretmenu EQUS "_2dmenu" interpretmenu EQUS "_2dmenu"
interpretmenu2 EQUS "verticalmenu" interpretmenu2 EQUS "verticalmenu"

2
macros/scripts/battle_anims.asm
View File

@ -1,6 +1,6 @@
anim_wait: MACRO anim_wait: MACRO
if \1 >= $d0 if \1 >= $d0
flip out fail "anim_wait argument must be less than $d0."
endc endc
db \1 db \1
ENDM ENDM

12
macros/scripts/events.asm
View File

@ -516,9 +516,9 @@ yesorno: MACRO
db yesorno_command db yesorno_command
ENDM ENDM
enum loadmenuheader_command ; $4f enum loadmenu_command ; $4f
loadmenuheader: MACRO loadmenu: MACRO
db loadmenuheader_command db loadmenu_command
dw \1 ; menu_header dw \1 ; menu_header
ENDM ENDM
@ -747,9 +747,9 @@ showemote: MACRO
db \3 ; time db \3 ; time
ENDM ENDM
enum objectface_command ; $76 enum turnobject_command ; $76
objectface: MACRO turnobject: MACRO
db objectface_command db turnobject_command
db \1 ; object id db \1 ; object id
db \2 ; facing db \2 ; facing
ENDM ENDM

16
maps/AzaleaTown.asm
View File

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

6
maps/BattleTower1F.asm
View File

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

4
maps/BurnedTower1F.asm
View File

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

18
maps/BurnedTowerB1F.asm
View File

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

12
maps/CeladonCafe.asm
View File

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

4
maps/CeladonDeptStore3F.asm
View File

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

2
maps/CeladonDeptStore6F.asm
View File

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

14
maps/CeladonGameCorner.asm
View File

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

4
maps/CeladonGameCornerPrizeRoom.asm
View File

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

4
maps/CeruleanCity.asm
View File

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

2
maps/CeruleanGym.asm
View File

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

20
maps/CherrygroveCity.asm
View File

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

4
maps/CianwoodCity.asm
View File

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

2
maps/CianwoodGym.asm
View File

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

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