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`
## `$4F`: <code>loadmenuheader <i>menu_header</i></code>
## `$4F`: <code>loadmenu <i>menu_header</i></code>
## `$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>
## `$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>

10
engine/events/std_scripts.asm
View File

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

8
engine/scripting.asm
View File

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

7
macros/legacy.asm
View File

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

2
macros/scripts/battle_anims.asm
View File

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

12
macros/scripts/events.asm
View File

@ -516,9 +516,9 @@ yesorno: MACRO
db yesorno_command
ENDM
enum loadmenuheader_command ; $4f
loadmenuheader: MACRO
db loadmenuheader_command
enum loadmenu_command ; $4f
loadmenu: MACRO
db loadmenu_command
dw \1 ; menu_header
ENDM
@ -747,9 +747,9 @@ showemote: MACRO
db \3 ; time
ENDM
enum objectface_command ; $76
objectface: MACRO
db objectface_command
enum turnobject_command ; $76
turnobject: MACRO
db turnobject_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
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

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