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

Consolidate Special function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 17:13:57 +01:00
parent 7c0e903c48
commit f1ea15bbfe
92 changed files with 278 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maps/BattleTowerBattleRoom.asm
View File

@@ -33,7 +33,7 @@ Script_BattleRoomLoop: ; 0x9f425
buttonsound
closetext
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
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 Special_FadeOutPalettes
special LoadMapPalettes
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext Text_NextUpOpponentNo
@@ -75,7 +75,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitsfx
special FadeOutPalettes
special Special_FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@@ -86,7 +86,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLETOWERACTION_06
special BattleTowerAction
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
opentext
jump Script_BattleTowerHopeToServeYouAgain

6
maps/BluesHouse.asm
View File

@@ -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

2
maps/BurnedTowerB1F.asm
View File

@@ -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

2
maps/CeladonDeptStore6F.asm
View File

@@ -24,7 +24,7 @@ CeladonDeptStore6FVendingMachine:
opentext
writetext CeladonVendingText
.Start:
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
loadmenudata .MenuData
verticalmenu
closewindow

2
maps/CianwoodCityPhotoStudio.asm
View File

@@ -16,7 +16,7 @@ FishingGuruScript_0x9e0e0:
iffalse UnknownScript_0x9e0f3
writetext UnknownText_0x9e142
waitbutton
special PhotoStudio
special Special_PhotoStudio
waitbutton
closetext
end

10
maps/CopycatsHouse2F.asm
View File

@@ -46,7 +46,7 @@ Copycat:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
.Default_Merge_1:
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_LoadUsedSpritesGFX
opentext
writetext CopycatText_ItsAScream
waitbutton

2
maps/EcruteakGym.asm
View File

@@ -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, $1b

4
maps/ElmsLab.asm
View File

@@ -312,7 +312,7 @@ ElmsLabHealingMachine_HealParty:
special HealParty
playmusic MUSIC_NONE
writebyte 1 ; Machine is in Elm's 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

4
maps/FastShip1F.asm
View File

@@ -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

10
maps/FuchsiaGym.asm
View File

@@ -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_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_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_MapCallbackSprites_LoadUsedSpritesGFX
.BarryUnmasked:
faceplayer
opentext

4
maps/FuchsiaPokecenter1F.asm
View File

@@ -33,7 +33,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_LoadUsedSpritesGFX
opentext
writetext UnknownText_0x19654e
waitbutton
@@ -41,7 +41,7 @@ JanineImpersonatorScript_0x196462:
applymovement FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR, MovementData_0x196486
faceplayer
variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_LoadUsedSpritesGFX
end
MovementData_0x196486:

4
maps/GoldenrodDeptStore5F.asm
View File

@@ -65,7 +65,7 @@ ReceptionistScript_0x560ce:
if_not_equal SUNDAY, .EventIsOver
checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
iftrue .EventIsOver
special GetFirstPokemonHappiness
special Special_GetFirstPokemonHappiness
writetext UnknownText_0x56143
buttonsound
if_greater_than $95, .VeryHappy
@@ -106,7 +106,7 @@ ReceptionistScript_0x560ce:
Carrie:
faceplayer
opentext
special SpecialGameboyCheck
special Special_GameboyCheck
if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked.
writetext UnknownText_0x56241
waitbutton

2
maps/GoldenrodDeptStore6F.asm
View File

@@ -13,7 +13,7 @@ GoldenrodVendingMachine:
opentext
writetext GoldenrodVendingText
.Start:
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
loadmenudata .MenuData
verticalmenu
closewindow

2
maps/GoldenrodHappinessRater.asm
View File

@@ -13,7 +13,7 @@ GoldenrodHappinessRater_MapScriptHeader:
TeacherScript_0x54953:
faceplayer
opentext
special GetFirstPokemonHappiness
special Special_GetFirstPokemonHappiness
writetext UnknownText_0x549a3
buttonsound
if_greater_than $f9, UnknownScript_0x54973

2
maps/GoldenrodNameRater.asm
View File

@@ -11,7 +11,7 @@ GoldenrodNameRater_MapScriptHeader:
GoldenrodNameRater:
faceplayer
opentext
special SpecialNameRater
special Special_NameRater
waitbutton
closetext
end

22
maps/GoldenrodUnderground.asm
View File

@@ -192,7 +192,7 @@ OlderHaircutBrotherScript:
.DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
iftrue .AlreadyGotHaircut
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
writetext UnknownText_0x7c5f9
yesorno
iffalse .Refused
@@ -228,14 +228,14 @@ OlderHaircutBrotherScript:
.then
takemoney $0, 500
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
writetext UnknownText_0x7c6b8
waitbutton
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext UnknownText_0x7c6d8
@@ -275,7 +275,7 @@ YoungerHaircutBrotherScript:
.DoHaircut:
checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
iftrue .AlreadyGotHaircut
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
writetext UnknownText_0x7c75c
yesorno
iffalse .Refused
@@ -311,14 +311,14 @@ YoungerHaircutBrotherScript:
.then
takemoney $0, 300
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
writetext UnknownText_0x7c80e
waitbutton
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
opentext
writetext UnknownText_0x7c82a
@@ -349,21 +349,21 @@ YoungerHaircutBrotherScript:
UnknownScript_0x7c2bb:
writetext HaircutBrosText_SlightlyHappier
special PlayCurMonCry
special Special_PlayCurMonCry
waitbutton
closetext
end
UnknownScript_0x7c2c4:
writetext HaircutBrosText_Happier
special PlayCurMonCry
special Special_PlayCurMonCry
waitbutton
closetext
end
UnknownScript_0x7c2cd:
writetext HaircutBrosText_MuchHappier
special PlayCurMonCry
special Special_PlayCurMonCry
waitbutton
closetext
end

2
maps/HallOfFame.asm
View File

@@ -31,7 +31,7 @@ HallOfFame_MapScriptHeader:
setscene $1
pause 15
writebyte 2 ; Machine is in the Hall of Fame
special HealMachineAnim
special Special_HealMachineAnim
setevent EVENT_BEAT_ELITE_FOUR
setevent EVENT_TELEPORT_GUY
setevent EVENT_RIVAL_SPROUT_TOWER

2
maps/IndigoPlateauPokecenter1F.asm
View File

@@ -158,7 +158,7 @@ TeleportGuyScript:
waitbutton
closetext
playsound SFX_WARP_TO
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
warp NEW_BARK_TOWN, $d, $6
end

4
maps/KrissHouse2F.asm
View File

@@ -17,7 +17,7 @@ KrissHouse2F_MapScriptHeader:
end
.InitializeRoom:
special ToggleDecorationsVisibility
special Special_ToggleDecorationsVisibility
setevent EVENT_IN_YOUR_ROOM
checkevent EVENT_INITIALIZED_EVENTS
iftrue .SkipInizialization
@@ -28,7 +28,7 @@ KrissHouse2F_MapScriptHeader:
return
.SetSpawn:
special ToggleMaptileDecorations
special Special_ToggleMaptileDecorations
return

2
maps/LancesRoom.asm
View File

@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
closetext
applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRunsBackAndForth
special FadeOutPalettes
special Special_FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end

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