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

4
engine/events/bug_contest/contest_2.asm
View File

@@ -87,7 +87,7 @@ BugCatchingContestantEventFlagTable: ; 139fe
dw EVENT_BUG_CATCHING_CONTESTANT_10A
; 13a12
ContestDropOffMons: ; 13a12
Special_ContestDropOffMons: ; 13a12
ld hl, PartyMon1HP
ld a, [hli]
or [hl]
@@ -112,7 +112,7 @@ ContestDropOffMons: ; 13a12
ret
; 13a31
ContestReturnMons: ; 13a31
Special_ContestReturnMons: ; 13a31
; Restore the species of the second mon.
ld hl, PartySpecies + 1
ld a, [wBugContestSecondPartySpecies]

2
engine/events/bug_contest/judging.asm
View File

@@ -1,4 +1,4 @@
_BugContestJudging: ; 1369d
_Special_BugContestJudging: ; 1369d
call ContestScore
farcall TrainerRankings_BugContestScore
call BugContest_JudgeContestants

4
engine/events/field_moves.asm
View File

@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1
BlindingFlash: ; 8c7e1
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
ld hl, wStatusFlags
set 2, [hl] ; Flash
farcall ReplaceTimeOfDayPals
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_MAPPALS
call GetSGBLayout
farcall LoadOW_BGPal7
farcall FadeInPalettes
farcall Special_FadeInPalettes
ret
; 8c80a

4
engine/events/halloffame.asm
View File

@@ -42,7 +42,7 @@ RedCredits:: ; 86455
ld [MusicFadeID + 1], a
ld a, 10
ld [MusicFade], a
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
@@ -65,7 +65,7 @@ HallOfFame_FadeOutMusic: ; 8648e
ld [MusicFadeID + 1], a
ld a, 10
ld [MusicFade], a
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a

4
engine/events/happiness_egg.asm
View File

@@ -1,4 +1,4 @@
GetFirstPokemonHappiness: ; 718d
Special_GetFirstPokemonHappiness: ; 718d
ld hl, PartyMon1Happiness
ld bc, PARTYMON_STRUCT_LENGTH
ld de, PartySpecies
@@ -17,7 +17,7 @@ GetFirstPokemonHappiness: ; 718d
call GetPokemonName
jp CopyPokemonName_Buffer1_Buffer3
CheckFirstMonIsEgg: ; 71ac
Special_CheckFirstMonIsEgg: ; 71ac
ld a, [PartySpecies]
ld [wd265], a
cp EGG

2
engine/events/heal_machine_anim.asm
View File

@@ -1,4 +1,4 @@
HealMachineAnim: ; 12324
Special_HealMachineAnim: ; 12324
; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon.
ld a, [PartyCount]
and a

4
engine/events/itemfinder.asm
View File

@@ -30,7 +30,7 @@ ItemFinder: ; 12580
.Script_FoundSomething: ; 0x125ad
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
callasm .ItemfinderSound
writetext .Text_FoundSomething
closetext
@@ -39,7 +39,7 @@ ItemFinder: ; 12580
.Script_FoundNothing: ; 0x125ba
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writetext .Text_FoundNothing
closetext
end

2
engine/events/magnet_train.asm
View File

@@ -442,7 +442,7 @@ MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
ld [wEnvironment], a
ld b, SCGB_MAPPALS
call GetSGBLayout
call UpdateTimePals
call Special_UpdateTimePals
ld a, [rBGP]
ld [wBGP], a
ld a, [rOBP0]

2
engine/events/misc_scripts.asm
View File

@@ -2,7 +2,7 @@ Script_AbortBugContest: ; 0x122c1
checkflag ENGINE_BUG_CONTEST_TIMER
iffalse .finish
setflag ENGINE_DAILY_BUG_CONTEST
special ContestReturnMons
special Special_ContestReturnMons
.finish
end

2
engine/events/move_deleter.asm
View File

@@ -1,4 +1,4 @@
MoveDeletion:
Special_MoveDeletion:
ld hl, .IntroText
call PrintText
call YesNoBox

36
engine/events/overworld.asm
View File

@@ -208,7 +208,7 @@ CheckMapForSomethingToCut: ; c7ce
Script_CutFromMenu: ; c7fe
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
Script_Cut: ; 0xc802
callasm GetPartyNick
@@ -318,7 +318,7 @@ UseFlash: ; c8e0
Script_UseFlash: ; 0xc8e6
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writetext UnknownText_0xc8f3
callasm BlindingFlash
closetext
@@ -407,7 +407,7 @@ SurfFunction: ; c909
ret
SurfFromMenuScript: ; c983
special UpdateTimePals
special Special_UpdateTimePals
UsedSurfScript: ; c986
writetext UsedSurfText ; "used SURF!"
@@ -620,10 +620,10 @@ FlyFunction: ; ca3b
.FlyScript: ; 0xcaa3
reloadmappart
callasm HideSprites
special UpdateTimePals
special Special_UpdateTimePals
callasm FlyFromAnim
farscall Script_AbortBugContest
special WarpToSpawnPoint
special Special_WarpToSpawnPoint
callasm DelayLoadingNewSprites
writecode VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_FLY
@@ -680,7 +680,7 @@ CheckMapCanWaterfall: ; cb07
Script_WaterfallFromMenu: ; 0xcb1c
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
Script_UsedWaterfall: ; 0xcb20
callasm GetPartyNick
@@ -856,13 +856,13 @@ dig_incave
.UsedEscapeRopeScript: ; 0xcc2b
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writetext .Text_UsedEscapeRope
jump .UsedDigOrEscapeRopeScript
.UsedDigScript: ; 0xcc35
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writetext .Text_UsedDig
.UsedDigOrEscapeRopeScript: ; 0xcc3c
@@ -871,7 +871,7 @@ dig_incave
playsound SFX_WARP_TO
applymovement PLAYER, .DigOut
farscall Script_AbortBugContest
special WarpToSpawnPoint
special Special_WarpToSpawnPoint
writecode VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_DOOR
playsound SFX_WARP_FROM
@@ -950,7 +950,7 @@ TeleportFunction: ; cc61
.TeleportScript: ; 0xccbb
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writetext .Text_ReturnToLastMonCenter
pause 60
reloadmappart
@@ -958,7 +958,7 @@ TeleportFunction: ; cc61
playsound SFX_WARP_TO
applymovement PLAYER, .TeleportFrom
farscall Script_AbortBugContest
special WarpToSpawnPoint
special Special_WarpToSpawnPoint
writecode VAR_MOVEMENT, PLAYER_NORMAL
newloadmap MAPSETUP_TELEPORT
playsound SFX_WARP_FROM
@@ -1021,7 +1021,7 @@ SetStrengthFlag: ; cd12
Script_StrengthFromMenu: ; 0xcd29
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
Script_UsedStrength: ; 0xcd2d
callasm SetStrengthFlag
@@ -1183,7 +1183,7 @@ TryWhirlpoolMenu: ; cdde
Script_WhirlpoolFromMenu: ; 0xce0b
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
Script_UsedWhirlpool: ; 0xce0f
callasm GetPartyNick
@@ -1284,7 +1284,7 @@ UnknownText_0xcea2: ; 0xcea2
HeadbuttFromMenuScript: ; 0xcea7
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
HeadbuttScript: ; 0xceab
callasm GetPartyNick
@@ -1382,7 +1382,7 @@ GetFacingObject: ; cf0d
RockSmashFromMenuScript: ; 0xcf2e
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
RockSmashScript: ; cf32
callasm GetPartyNick
@@ -1611,7 +1611,7 @@ Fishing_CheckFacingUp: ; d06c
Script_FishCastRod: ; 0xd07c
reloadmappart
loadvar hBGMapMode, $0
special UpdateTimePals
special Special_UpdateTimePals
loademote EMOTE_ROD
callasm LoadFishingGFX
loademote EMOTE_SHOCK
@@ -1735,7 +1735,7 @@ BikeFunction: ; d0b3
Script_GetOnBike: ; 0xd13e
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_BIKE
writetext GotOnTheBikeText
waitbutton
@@ -1755,7 +1755,7 @@ Script_GetOnBike_Register: ; 0xd14e
Script_GetOffBike: ; 0xd158
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
writecode VAR_MOVEMENT, PLAYER_NORMAL
writetext GotOffTheBikeText
waitbutton

4
engine/events/poisonstep_pals.asm
View File

@@ -20,7 +20,7 @@ LoadPoisonBGPals: ; cbcdd
call DmgToCgbBGPals
ld c, 4
call DelayFrames
farcall _UpdateTimePals
farcall _Special_UpdateTimePals
ret
.cgb
@@ -44,5 +44,5 @@ LoadPoisonBGPals: ; cbcdd
ld [hCGBPalUpdate], a
ld c, 4
call DelayFrames
farcall _UpdateTimePals
farcall _Special_UpdateTimePals
ret

4
engine/events/pokecenter_pc.asm
View File

@@ -1,4 +1,4 @@
PokemonCenterPC: ; 1559a
Special_PokemonCenterPC: ; 1559a
call PC_CheckPartyForPokemon
ret c
call PC_PlayBootSound
@@ -216,7 +216,7 @@ Function15715: ; 15715
ld hl, KrissPCMenuData
call LoadMenuDataHeader
.asm_15722
call UpdateTimePals
call Special_UpdateTimePals
call DoNthMenu
jr c, .asm_15731
call MenuJumptable

2
engine/events/print_photo.asm
View File

@@ -1,4 +1,4 @@
PhotoStudio: ; 16dc7
Special_PhotoStudio: ; 16dc7
ld hl, .Text_AskWhichMon
call PrintText
farcall SelectMonFromParty

4
engine/events/prof_oaks_pc.asm
View File

@@ -3,7 +3,7 @@ ProfOaksPC: ; 0x265d3
call MenuTextBox
call YesNoBox
jr c, .shutdown
call ProfOaksPCBoot ; player chose "yes"?
call Special_ProfOaksPCBoot ; player chose "yes"?
.shutdown
ld hl, OakPCText4
call PrintText
@@ -11,7 +11,7 @@ ProfOaksPC: ; 0x265d3
call ExitMenu
ret
ProfOaksPCBoot ; 0x265ee
Special_ProfOaksPCBoot ; 0x265ee
ld hl, OakPCText2
call PrintText
call Rate

12
engine/events/sacred_ash.asm
View File

@@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
special HealParty
reloadmappart
playsound SFX_WARP_TO
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special Special_FadeOutPalettes
special Special_FadeInPalettes
special Special_FadeOutPalettes
special Special_FadeInPalettes
special Special_FadeOutPalettes
special Special_FadeInPalettes
waitsfx
writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON

4
engine/events/special.asm
View File

@@ -1,4 +1,4 @@
SpecialGiveShuckle: ; 7305
Special_GiveShuckle: ; 7305
; Adding to the party.
xor a
@@ -70,7 +70,7 @@ SpecialShuckleOT:
SpecialShuckleNick:
db "SHUCKIE@"
SpecialReturnShuckle: ; 737e
Special_ReturnShuckle: ; 737e
farcall SelectMonFromParty
jr c, .refused

2
engine/events/squirtbottle.asm
View File

@@ -7,7 +7,7 @@ _Squirtbottle: ; 50730
.SquirtbottleScript:
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
callasm .CheckCanUseSquirtbottle
iffalse .NothingHappenedScript
farjump WateredWeirdTreeScript

22
engine/events/std_scripts.asm
View File

@@ -113,7 +113,7 @@ PokecenterNurseScript:
special HealParty
playmusic MUSIC_NONE
writebyte 0 ; Machine is at a Pokemon Center
special HealMachineAnim
special Special_HealMachineAnim
pause 30
special RestartMapMusic
spriteface LAST_TALKED, DOWN
@@ -123,7 +123,7 @@ PokecenterNurseScript:
iftrue .no
checkflag ENGINE_POKERUS ; nurse already talked about pokerus
iftrue .no
special SpecialCheckPokerus
special Special_CheckPokerus
iftrue .pokerus
.no
@@ -203,7 +203,7 @@ HomepageScript:
Radio1Script:
opentext
writebyte MAPRADIO_POKEMON_CHANNEL
special MapRadio
special Special_MapRadio
closetext
end
@@ -211,7 +211,7 @@ Radio2Script:
; Lucky Channel
opentext
writebyte MAPRADIO_LUCKY_CHANNEL
special MapRadio
special Special_MapRadio
closetext
end
@@ -220,7 +220,7 @@ TrashCanScript: ; 0xbc1a5
PCScript:
opentext
special PokemonCenterPC
special Special_PokemonCenterPC
closetext
end
@@ -319,7 +319,7 @@ BugContestResultsScript:
opentext
farwritetext ContestResults_ReadyToJudgeText
waitbutton
special BugContestJudging
special Special_BugContestJudging
RAM2MEM $0
if_equal 1, BugContestResults_FirstPlace
if_equal 2, BugContestResults_SecondPlace
@@ -345,9 +345,9 @@ BugContestResults_FinishUp
iffalse BugContestResults_DidNotLeaveMons
farwritetext ContestResults_ReturnPartyText
waitbutton
special ContestReturnMons
special Special_ContestReturnMons
BugContestResults_DidNotLeaveMons
special CheckPartyFullAfterContest
special Special_CheckPartyFullAfterContest
if_equal $0, BugContestResults_CleanUp
if_equal $2, BugContestResults_CleanUp
farwritetext ContestResults_PartyFullText
@@ -620,7 +620,7 @@ InitializeEventsScript:
return
AskNumber1MScript:
special RandomPhoneMon
special Special_RandomPhoneMon
checkcode VAR_CALLERID
if_equal PHONE_SCHOOLBOY_JACK, .Jack
if_equal PHONE_SAILOR_HUEY, .Huey
@@ -705,7 +705,7 @@ AskNumber1MScript:
end
AskNumber2MScript:
special RandomPhoneMon
special Special_RandomPhoneMon
checkcode VAR_CALLERID
if_equal PHONE_SCHOOLBOY_JACK, .Jack
if_equal PHONE_SAILOR_HUEY, .Huey
@@ -1886,7 +1886,7 @@ CoinVendor_IntroScript: ; 0xbcde0
HappinessCheckScript:
faceplayer
opentext
special GetFirstPokemonHappiness
special Special_GetFirstPokemonHappiness
if_less_than 50, .Unhappy
if_less_than 150, .KindaHappy
farwritetext HappinessText3

2
engine/events/sweet_scent.asm
View File

@@ -8,7 +8,7 @@ SweetScentFromMenu: ; 506bc
.SweetScent: ; 0x506c8
reloadmappart
special UpdateTimePals
special Special_UpdateTimePals
callasm GetPartyNick
writetext UnknownText_0x50726
waitbutton

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