Consolidate Special function names

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

0
FETCH_HEAD Normal file
View File

View File

@@ -6,7 +6,7 @@ CARDFLIP_DECK_SIZE EQU 4 * 6
Unknown_e00ed: ; e00ed (38:40ed) Unknown_e00ed: ; e00ed (38:40ed)
; Graphics for an unused Game Corner ; Graphics for an unused Game Corner
; game were meant to be here. ; game were meant to be here.
Ret_e00ed: ; e00ed (38:40ed) ret_e00ed: ; e00ed (38:40ed)
ret ret
_CardFlip: ; e00ee (38:40ee) _CardFlip: ; e00ee (38:40ee)

View File

@@ -1,4 +1,4 @@
CheckPartyFullAfterContest: ; 4d9e5 Special_CheckPartyFullAfterContest: ; 4d9e5
ld a, [wContestMon] ld a, [wContestMon]
and a and a
jp z, .DidntCatchAnything jp z, .DidntCatchAnything

View File

@@ -43,7 +43,7 @@ CheckShininess:
and a and a
ret ret
Unreferenced_CheckContestMon: UnusedPredef_CheckContestMon:
; Check a mon's DVs at hl in the bug catching contest. ; Check a mon's DVs at hl in the bug catching contest.
; Return carry if its DVs are good enough to place in the contest. ; Return carry if its DVs are good enough to place in the contest.

View File

@@ -1197,7 +1197,7 @@ DecorationDesc_GiantOrnament: ; 26fdd
db "@" db "@"
; 0x26feb ; 0x26feb
ToggleMaptileDecorations: ; 26feb Special_ToggleMaptileDecorations: ; 26feb
lb de, 0, 4 lb de, 0, 4
ld a, [Bed] ld a, [Bed]
call SetDecorationTile call SetDecorationTile
@@ -1251,7 +1251,7 @@ SetDecorationTile: ; 27037
ret ret
; 27043 ; 27043
ToggleDecorationsVisibility: ; 27043 Special_ToggleDecorationsVisibility: ; 27043
ld de, EVENT_KRISS_HOUSE_2F_CONSOLE ld de, EVENT_KRISS_HOUSE_2F_CONSOLE
ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS ld hl, VariableSprites + SPRITE_CONSOLE - SPRITE_VARS
ld a, [Console] ld a, [Console]

View File

@@ -77,7 +77,7 @@ _DummyGame: ; e1e5b (38:5e5b)
ret ret
.ResetBoard: .ResetBoard:
call Ret_e00ed call ret_e00ed
jr nc, .proceed jr nc, .proceed
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set 7, [hl]
@@ -232,7 +232,7 @@ endr
ld hl, wJumptableIndex ld hl, wJumptableIndex
inc [hl] inc [hl]
.AskPlayAgain: .AskPlayAgain:
call Ret_e00ed call ret_e00ed
jr nc, .restart jr nc, .restart
ld hl, wJumptableIndex ld hl, wJumptableIndex
set 7, [hl] set 7, [hl]

View File

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

View File

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

View File

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

View File

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

View File

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

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. ; 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] ld a, [PartyCount]
and a and a

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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