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

spriteface → objectface, consistent with the other script commands

Browse Source
This commit is contained in:
Rangi 2018-02-02 21:50:43 -05:00
parent aa8db1632c
commit c834bdadf2
80 changed files with 323 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/event_commands.md
View File

@ -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>
## `$76`: <code>spriteface <i>object_id</i>, <i>facing</i></code>
## `$76`: <code>objectface <i>object_id</i>, <i>facing</i></code>
## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code>

8
engine/events/std_scripts.asm
View File

@ -109,7 +109,7 @@ PokecenterNurseScript:
farwritetext NurseTakePokemonText
pause 20
special StubbedTrainerRankings_Healings
spriteface LAST_TALKED, LEFT
objectface LAST_TALKED, LEFT
pause 10
special HealParty
playmusic MUSIC_NONE
@ -117,7 +117,7 @@ PokecenterNurseScript:
special HealMachineAnim
pause 30
special RestartMapMusic
spriteface LAST_TALKED, DOWN
objectface LAST_TALKED, DOWN
pause 10
checkphonecall ; elm already called about pokerus
@ -134,9 +134,9 @@ PokecenterNurseScript:
.done
farwritetext NurseGoodbyeText
spriteface LAST_TALKED, UP
objectface LAST_TALKED, UP
pause 10
spriteface LAST_TALKED, DOWN
objectface LAST_TALKED, DOWN
pause 10
waitbutton

4
engine/scripting.asm
View File

@ -185,7 +185,7 @@ endc
dw Script_writeobjectxy ; 73
dw Script_loademote ; 74
dw Script_showemote ; 75
dw Script_spriteface ; 76
dw Script_objectface ; 76
dw Script_follownotexact ; 77
dw Script_earthquake ; 78
dw Script_changemap ; 79
@ -1052,7 +1052,7 @@ Script_faceobject:
call ApplyObjectFacing
ret
Script_spriteface:
Script_objectface:
; script command 0x76
; parameters: object_id, facing

6
macros/scripts/events.asm
View File

@ -747,9 +747,9 @@ showemote: MACRO
db \3 ; time
ENDM
enum spriteface_command ; $76
spriteface: MACRO
db spriteface_command
enum objectface_command ; $76
objectface: MACRO
db objectface_command
db \1 ; object id
db \2 ; facing
ENDM

16
maps/AzaleaTown.asm
View File

@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11
spriteface PLAYER, RIGHT
objectface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
spriteface PLAYER, DOWN
objectface PLAYER, DOWN
jump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2:
spriteface PLAYER, RIGHT
objectface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
spriteface PLAYER, UP
objectface PLAYER, UP
AzaleaTownRivalBattleScript:
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
writetext AzaleaTownRivalAfterText
waitbutton
closetext
spriteface PLAYER, LEFT
objectface PLAYER, LEFT
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
opentext
writetext AzaleaTownKurtText1
buttonsound
spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
writetext AzaleaTownKurtText2
buttonsound
writetext AzaleaTownKurtText3
waitbutton
verbosegiveitem GS_BALL
spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
objectface 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
spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
objectface 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
spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
objectface BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
waitbutton
spriteface BATTLETOWER1F_RECEPTIONIST, DOWN
objectface BATTLETOWER1F_RECEPTIONIST, DOWN
closetext
end
@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
writetext Text_BattleTowerYoungster
waitbutton
closetext
spriteface BATTLETOWER1F_YOUNGSTER, RIGHT
objectface BATTLETOWER1F_YOUNGSTER, RIGHT
end
CooltrainerFScript_0x9e568:

4
maps/BurnedTower1F.asm
View File

@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
return
.MeetEusine:
spriteface BURNEDTOWER1F_EUSINE, DOWN
objectface 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
spriteface BURNEDTOWER1F_SILVER, RIGHT
objectface 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
spriteface PLAYER, UP
objectface PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_RAIKOU2
pause 15
cry RAIKOU
appear BURNEDTOWERB1F_ENTEI1
spriteface PLAYER, UP
objectface PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_ENTEI2
pause 15
cry ENTEI
appear BURNEDTOWERB1F_SUICUNE1
spriteface PLAYER, UP
objectface PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_SUICUNE2
pause 15
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
spriteface PLAYER, LEFT
objectface PLAYER, LEFT
applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
disappear BURNEDTOWERB1F_RAIKOU1
waitsfx
playsound SFX_WARP_FROM
spriteface PLAYER, RIGHT
objectface PLAYER, RIGHT
applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
disappear BURNEDTOWERB1F_ENTEI1
waitsfx
pause 15
playsound SFX_WARP_FROM
spriteface PLAYER, UP
objectface PLAYER, UP
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
playsound SFX_WARP_FROM
spriteface PLAYER, DOWN
objectface PLAYER, DOWN
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
spriteface PLAYER, UP
objectface PLAYER, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
spriteface PLAYER, DOWN
objectface PLAYER, DOWN
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic

12
maps/CeladonCafe.asm
View File

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

4
maps/CeladonDeptStore3F.asm
View File

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

14
maps/CeladonGameCorner.asm
View File

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

4
maps/CeruleanCity.asm
View File

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

2
maps/CeruleanGym.asm
View File

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

20
maps/CherrygroveCity.asm
View File

@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
spriteface PLAYER, UP
objectface PLAYER, UP
opentext
writetext GuideGentMartText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
spriteface PLAYER, UP
objectface PLAYER, UP
opentext
writetext GuideGentRoute30Text
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
spriteface PLAYER, LEFT
objectface PLAYER, LEFT
opentext
writetext GuideGentSeaText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
spriteface PLAYER, UP
objectface PLAYER, UP
pause 60
spriteface CHERRYGROVECITY_GRAMPS, LEFT
spriteface PLAYER, RIGHT
objectface CHERRYGROVECITY_GRAMPS, LEFT
objectface PLAYER, RIGHT
opentext
writetext GuideGentGiftText
buttonsound
@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
closetext
stopfollow
special RestartMapMusic
spriteface PLAYER, UP
objectface 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:
spriteface PLAYER, RIGHT
objectface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear CHERRYGROVECITY_SILVER
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
spriteface PLAYER, RIGHT
objectface PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext UnknownText_0x19c4e2
@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
.FinishRival:
playsound SFX_TACKLE
applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
spriteface PLAYER, LEFT
objectface 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:
spriteface PLAYER, UP
objectface PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
spriteface PLAYER, DOWN
objectface 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
spriteface CIANWOODGYM_CHUCK, RIGHT
objectface CIANWOODGYM_CHUCK, RIGHT
opentext
writetext ChuckIntroText2
waitbutton

18
maps/DragonShrine.asm
View File

@ -91,12 +91,12 @@ DragonShrine_MapScripts:
iftrue .Question2
.WrongAnswer:
closetext
spriteface DRAGONSHRINE_ELDER1, LEFT
objectface DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineWrongAnswerText1
waitbutton
closetext
spriteface DRAGONSHRINE_ELDER1, DOWN
objectface DRAGONSHRINE_ELDER1, DOWN
opentext
writetext DragonShrineWrongAnswerText2
waitbutton
@ -122,12 +122,12 @@ DragonShrine_MapScripts:
playmusic MUSIC_CLAIR
appear DRAGONSHRINE_CLAIR
waitsfx
spriteface PLAYER, DOWN
objectface PLAYER, DOWN
pause 30
applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
spriteface DRAGONSHRINE_CLAIR, RIGHT
spriteface PLAYER, LEFT
spriteface DRAGONSHRINE_ELDER1, LEFT
objectface DRAGONSHRINE_CLAIR, RIGHT
objectface PLAYER, LEFT
objectface DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineClairYouPassedText
waitbutton
@ -144,7 +144,7 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
spriteface DRAGONSHRINE_CLAIR, UP
objectface DRAGONSHRINE_CLAIR, UP
opentext
writetext DragonShrineMustIInformLanceText
waitbutton
@ -171,9 +171,9 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
spriteface DRAGONSHRINE_CLAIR, UP
objectface DRAGONSHRINE_CLAIR, UP
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
spriteface PLAYER, UP
objectface 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
spriteface PLAYER, LEFT
objectface PLAYER, LEFT
playmusic MUSIC_CLAIR
applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
opentext

4
maps/EarlsPokemonAcademy.asm
View File

@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
writetext EarlsPokemonAcademyGameboyKid1Text
waitbutton
closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
end
EarlsPokemonAcademyGameboyKid2Script:
@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
writetext EarlsPokemonAcademyGameboyKid2Text
waitbutton
closetext
spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
end
EarlsPokemonAcademyYoungster2Script:

12
maps/EcruteakPokecenter1F.asm
View File

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

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