pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
FETCH_HEAD Normal file
View File

2
engine/card_flip.asm
View File

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

2
engine/caught_data.asm
View File

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

2
engine/color.asm
View File

@ -43,7 +43,7 @@ CheckShininess:
and a
ret
Unreferenced_CheckContestMon:
UnusedPredef_CheckContestMon:
; 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.

4
engine/decorations.asm
View File

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

4
engine/dummy_game.asm
View File

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

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

4
engine/events/whiteout.asm
View File

@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
waitbutton
special FadeOutPalettes
special Special_FadeOutPalettes
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
@ -18,7 +18,7 @@ Script_Whiteout: ; 0x124ce
callasm HalveMoney
callasm GetWhiteoutSpawn
farscall Script_AbortBugContest
special WarpToSpawnPoint
special Special_WarpToSpawnPoint
newloadmap MAPSETUP_WARP
end_all

2
engine/events_2.asm
View File

@ -1,7 +1,7 @@
; More overworld event handling.
WarpToSpawnPoint:: ; 97c28
Special_WarpToSpawnPoint:: ; 97c28
ld hl, wStatusFlags2
res 1, [hl] ; safari zone?
res 2, [hl] ; bug contest

2
engine/intro_menu.asm
View File

@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219
ld [hWY], a
ld b, SCGB_DIPLOMA
call GetSGBLayout
call UpdateTimePals
call Special_UpdateTimePals
ld a, [wIntroSceneFrameCounter]
cp $5
jr c, .ok

2
engine/link.asm
View File

@ -2143,7 +2143,7 @@ Special_EnterTimeCapsule: ; 29c7b
ret
; 29c92
WaitForOtherPlayerToExit: ; 29c92
Special_WaitForOtherPlayerToExit: ; 29c92
ld c, 3
call DelayFrames
ld a, -1

6
engine/map_setup.asm
View File

@ -91,8 +91,8 @@ MapSetupCommands: ; 15440
dba LoadMapAttributes ; 1a
dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c
dba FadeOutPalettes ; 1d
dba FadeInPalettes ; 1e
dba Special_FadeOutPalettes ; 1d
dba Special_FadeInPalettes ; 1e
dba GetCoordOfUpperLeftCorner ; 1f
dba RestoreFacingAfterWarp ; 20
dba SpawnInFacingDown ; 21
@ -233,7 +233,7 @@ FadeOldMapMusic: ; 15567
; 1556d
RetainOldPalettes: ; 1556d
farcall _UpdateTimePals
farcall _Special_UpdateTimePals
ret
RotatePalettesRightMapAndMusic: ; 15574

2
engine/mart.asm
View File

@ -443,7 +443,7 @@ GetMartDialogGroup: ; 15ca3
BuyMenuLoop: ; 15cef
farcall PlaceMoneyTopRight
farcall Special_PlaceMoneyTopRight
call UpdateSprites
ld hl, MenuDataHeader_Buy
call CopyMenuDataHeader

2
engine/menu_2.asm
View File

@ -27,7 +27,7 @@ PlaceMenuItemQuantity: ; 0x24ac3
.done
ret
PlaceMoneyTopRight: ; 24ae8
Special_PlaceMoneyTopRight: ; 24ae8
ld hl, MenuDataHeader_0x24b15
call CopyMenuDataHeader
jr PlaceMoneyDataHeader

2
engine/mon_stats.asm
View File

@ -335,7 +335,7 @@ Unreferenced_Function50cd0: ; 50cd0
jr nz, .loop
ret
UnreferencedPredef22:
UnusedPredef22:
push hl
push hl
ld hl, PartyMonNicknames

8
engine/overworld.asm
View File

@ -23,7 +23,7 @@ Function14146: ; mobile
push af
res 7, [hl]
set 6, [hl]
call MapCallbackSprites_LoadUsedSpritesGFX
call Special_MapCallbackSprites_LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
ret
@ -35,7 +35,7 @@ Function14157: ; mobile
push af
set 7, [hl]
res 6, [hl]
call MapCallbackSprites_LoadUsedSpritesGFX
call Special_MapCallbackSprites_LoadUsedSpritesGFX
pop af
ld [wSpriteFlags], a
ret
@ -43,7 +43,7 @@ Function14157: ; mobile
RefreshSprites:: ; 14168
call .Refresh
call MapCallbackSprites_LoadUsedSpritesGFX
call Special_MapCallbackSprites_LoadUsedSpritesGFX
ret
; 1416f
@ -164,7 +164,7 @@ AddOutdoorSprites: ; 141ee
; 14209
MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
Special_MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
ld a, MAPCALLBACK_SPRITES
call RunMapCallback
call GetUsedSprites

2
engine/phone/generic_calls.asm
View File

@ -1240,7 +1240,7 @@ PhoneScript_Generic_Female:
end
PhoneScript_MonFlavorText:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal $0, .TooEnergetic
farwritetext UnknownText_0x1b518b

10
engine/phone/phone_callers.asm
View File

@ -1,5 +1,5 @@
Phone_GenericCall_Male:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal 0, .Bragging
farscall PhoneScript_Generic_Male
@ -9,7 +9,7 @@ Phone_GenericCall_Male:
farjump Phone_BraggingCall_Male
Phone_GenericCall_Female:
special RandomPhoneMon
special Special_RandomPhoneMon
farscall PhoneScript_Random2
if_equal 0, .Bragging
farscall PhoneScript_Generic_Female
@ -27,7 +27,7 @@ Phone_BraggingCall_Female:
farjump Phone_FoundAMon_Female
Phone_FoundAMon_Male:
special RandomPhoneWildMon
special Special_RandomPhoneWildMon
farscall PhoneScript_Random2
if_equal 0, .GotAway
farscall Phone_WhoDefeatedMon_Male
@ -37,7 +37,7 @@ Phone_FoundAMon_Male:
farjump Phone_GotAwayCall_Male
Phone_FoundAMon_Female:
special RandomPhoneWildMon
special Special_RandomPhoneWildMon
farscall PhoneScript_Random2
if_equal 0, .GotAway
farscall Phone_WhoDefeatedMon_Female
@ -851,7 +851,7 @@ Phone_CheckIfUnseenRare_Female:
farjump PhoneScript_HangupText_Female
PhoneScriptRareWildMon:
special RandomUnseenWildMon
special Special_RandomUnseenWildMon
end
PhoneScript_BugCatchingContest:

6
engine/phone/phone_scripts.asm
View File

@ -392,7 +392,7 @@ HueyPhoneScript1:
iftrue HueyWednesdayNight
.NotWednesday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0908
.WantsBattle:
@ -629,7 +629,7 @@ JoeyPhoneScript1:
iftrue JoeyMondayAfternoon
.NotMonday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0930
.WantsBattle:
@ -851,7 +851,7 @@ LizPhoneScript1:
iftrue LizThursdayAfternoon
.NotThursday:
special RandomPhoneMon
special Special_RandomPhoneMon
farjump UnknownScript_0xa0948
.WantsBattle:

2
engine/pic_animation.asm
View File

@ -1110,7 +1110,7 @@ PokeAnim_GetSpeciesOrUnown: ; d065c
ret
; d0669
UnreferencedPredef48: ; d0669 Predef 48
UnusedPredef48: ; d0669 Predef 48
ld a, $1
ld [wBoxAlignment], a

6
engine/predef.asm
View File

@ -64,7 +64,7 @@ PredefPointers:: ; 856b
add_predef CopyPkmnToTempMon
add_predef ListMoves ; $20
add_predef PlaceNonFaintStatus
add_predef UnreferencedPredef22
add_predef UnusedPredef22
add_predef ListMovePP
add_predef GetGender
add_predef StatsScreenInit
@ -81,7 +81,7 @@ PredefPointers:: ; 856b
add_predef InitSGBBorder ; $30
add_predef LoadSGBLayout
add_predef Pokedex_GetArea
add_predef Unreferenced_CheckContestMon
add_predef UnusedPredef_CheckContestMon
add_predef DoBattleTransition
add_predef DummyPredef35
add_predef DummyPredef36
@ -102,7 +102,7 @@ PredefPointers:: ; 856b
add_predef PlaceStatusString
add_predef LoadMonAnimation
add_predef AnimateFrontpic
add_predef UnreferencedPredef48 ; $48
add_predef UnusedPredef48 ; $48
add_predef HOF_AnimateFrontpic
dbw $ff, InexplicablyEmptyFunction ; ???
; 864c

2
engine/routines/playslowcry.asm
View File

@ -1,4 +1,4 @@
PlaySlowCry: ; fb841
Special_PlaySlowCry: ; fb841
ld a, [ScriptVar]
call LoadCryHeader
jr c, .done

114
engine/specials.asm
View File

@ -15,7 +15,7 @@ Special:: ; c01b
; c029
SpecialsPointers:: ; c029
add_special WarpToSpawnPoint
add_special Special_WarpToSpawnPoint
; Communications
add_special Special_SetBitsForLinkTradeRequest
@ -25,7 +25,7 @@ SpecialsPointers:: ; c029
add_special Special_CheckBothSelectedSameRoom
add_special Special_FailedLinkToPast
add_special Special_CloseLink
add_special WaitForOtherPlayerToExit
add_special Special_WaitForOtherPlayerToExit
add_special Special_SetBitsForBattleRequest
add_special Special_SetBitsForTimeCapsuleRequest
add_special Special_CheckTimeCapsuleCompatibility
@ -39,92 +39,92 @@ SpecialsPointers:: ; c029
add_special Special_UnlockMysteryGift
; Map Events
add_special BugContestJudging
add_special CheckPartyFullAfterContest
add_special ContestDropOffMons
add_special ContestReturnMons
add_special Special_BugContestJudging
add_special Special_CheckPartyFullAfterContest
add_special Special_ContestDropOffMons
add_special Special_ContestReturnMons
add_special Special_GiveParkBalls
add_special Special_CheckMagikarpLength
add_special Special_MagikarpHouseSign
add_special HealParty
add_special PokemonCenterPC
add_special HealParty ; this is both a special and a predef
add_special Special_PokemonCenterPC
add_special Special_KrissHousePC
add_special Special_DayCareMan
add_special Special_DayCareLady
add_special Special_DayCareManOutside
add_special MoveDeletion
add_special Special_MoveDeletion
add_special Special_BankOfMom
add_special Special_MagnetTrain
add_special SpecialNameRival
add_special Special_NameRival
add_special Special_SetDayOfWeek
add_special Special_TownMap
add_special Special_UnownPrinter
add_special MapRadio
add_special Special_MapRadio
add_special Special_UnownPuzzle
add_special Special_SlotMachine
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen
add_special FadeOutPalettes
add_special Special_FadeOutPalettes
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
add_special FadeInPalettes
add_special Special_FadeInPalettes
add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes
add_special UpdateTimePals
add_special ClearTileMap
add_special UpdateSprites
add_special ReplaceKrisSprite
add_special ClearBGPalettes ; bank 0
add_special Special_UpdateTimePals
add_special ClearTileMap ; bank 0
add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; bank 0
add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon
add_special WaitSFX
add_special PlayMapMusic
add_special RestartMapMusic
add_special HealMachineAnim
add_special UnusedSpecial_SeenMon
add_special WaitSFX ; bank 0
add_special PlayMapMusic ; bank 0
add_special RestartMapMusic ; bank 0
add_special Special_HealMachineAnim
add_special Special_SurfStartStep
add_special Special_FindGreaterThanThatLevel
add_special Special_FindAtLeastThatHappy
add_special Special_FindThatSpecies
add_special Special_FindThatSpeciesYourTrainerID
add_special Special_CheckUnusedTwoDayTimer ; unreferenced
add_special UnusedSpecial_CheckUnusedTwoDayTimer
add_special Special_DayCareMon1
add_special Special_DayCareMon2
add_special Special_SelectRandomBugContestContestants
add_special Special_ActivateFishingSwarm
add_special ToggleMaptileDecorations
add_special ToggleDecorationsVisibility
add_special SpecialGiveShuckle
add_special SpecialReturnShuckle
add_special Special_ToggleMaptileDecorations
add_special Special_ToggleDecorationsVisibility
add_special Special_GiveShuckle
add_special Special_ReturnShuckle
add_special Special_BillsGrandfather
add_special SpecialCheckPokerus
add_special Special_CheckPokerus
add_special Special_DisplayCoinCaseBalance
add_special Special_DisplayMoneyAndCoinBalance
add_special PlaceMoneyTopRight
add_special Special_PlaceMoneyTopRight
add_special Special_CheckForLuckyNumberWinners
add_special Special_CheckLuckyNumberShowFlag
add_special Special_ResetLuckyNumberShowFlag
add_special Special_PrintTodaysLuckyNumber
add_special Special_SelectApricornForKurt
add_special SpecialNameRater
add_special Special_NameRater
add_special Special_DisplayLinkRecord
add_special GetFirstPokemonHappiness
add_special CheckFirstMonIsEgg
add_special RandomUnseenWildMon
add_special RandomPhoneWildMon
add_special RandomPhoneMon
add_special MapCallbackSprites_LoadUsedSpritesGFX
add_special PlaySlowCry
add_special SpecialSnorlaxAwake
add_special Special_GetFirstPokemonHappiness
add_special Special_CheckFirstMonIsEgg
add_special Special_RandomUnseenWildMon
add_special Special_RandomPhoneWildMon
add_special Special_RandomPhoneMon
add_special Special_MapCallbackSprites_LoadUsedSpritesGFX
add_special Special_PlaySlowCry
add_special Special_SnorlaxAwake
add_special Special_YoungerHaircutBrother
add_special Special_OlderHaircutBrother
add_special Special_DaisyMassage
add_special PlayCurMonCry
add_special ProfOaksPCBoot
add_special SpecialGameboyCheck
add_special SpecialTrainerHouse
add_special PhotoStudio
add_special InitRoamMons
add_special Special_PlayCurMonCry
add_special Special_ProfOaksPCBoot
add_special Special_GameboyCheck
add_special Special_TrainerHouse
add_special Special_PhotoStudio
add_special Special_InitRoamMons
add_special Special_FadeOutMusic
add_special Diploma
add_special PrintDiploma
@ -219,7 +219,7 @@ Special_GameCornerPrizeMonCheckDex: ; c230
ret
; c252
SpecialSeenMon: ; c252
UnusedSpecial_SeenMon: ; c252
ld a, [ScriptVar]
dec a
call SetSeenMon
@ -265,7 +265,7 @@ FoundNone: ; c298
ret
; c29d
SpecialNameRival: ; 0xc29d
Special_NameRival: ; 0xc29d
ld b, $2 ; rival
ld de, RivalName
farcall _NamingScreen
@ -279,7 +279,7 @@ SpecialNameRival: ; 0xc29d
DefaultRivalName: ; 0xc2b2
db "SILVER@"
SpecialNameRater: ; c2b9
Special_NameRater: ; c2b9
farcall NameRater
ret
; c2c0
@ -363,14 +363,14 @@ Special_GetMysteryGiftItem: ; c309
db "@"
; 0xc34a
BugContestJudging: ; c34a
farcall _BugContestJudging
Special_BugContestJudging: ; c34a
farcall _Special_BugContestJudging
ld a, b
ld [ScriptVar], a
ret
; c355
MapRadio: ; c355
Special_MapRadio: ; c355
ld a, [ScriptVar]
ld e, a
farcall PlayRadio
@ -483,7 +483,7 @@ ScriptReturnCarry: ; c3e2
ret
; c3ef
Special_CheckUnusedTwoDayTimer: ; c3ef
UnusedSpecial_CheckUnusedTwoDayTimer: ; c3ef
farcall CheckUnusedTwoDayTimer
ld a, [wUnusedTwoDayTimer]
ld [ScriptVar], a
@ -517,7 +517,7 @@ StoreSwarmMapIndices:: ; c403
; c419
SpecialCheckPokerus: ; c419
Special_CheckPokerus: ; c419
; Check if a monster in your party has Pokerus
farcall CheckPokerus
jp ScriptReturnCarry
@ -536,7 +536,7 @@ Special_CheckLuckyNumberShowFlag: ; c434
jp ScriptReturnCarry
; c43d
SpecialSnorlaxAwake: ; 0xc43d
Special_SnorlaxAwake: ; 0xc43d
; Check if the Poké Flute channel is playing, and if the player is standing
; next to Snorlax.
@ -587,13 +587,13 @@ SpecialSnorlaxAwake: ; 0xc43d
db -1
PlayCurMonCry: ; c472
Special_PlayCurMonCry: ; c472
ld a, [CurPartySpecies]
jp PlayCry
; c478
SpecialGameboyCheck: ; c478
Special_GameboyCheck: ; c478
ld a, [hCGB]
and a
jr nz, .cgb
@ -639,7 +639,7 @@ PrintDiploma: ; c4ac
ret
; c4b9
SpecialTrainerHouse: ; 0xc4b9
Special_TrainerHouse: ; 0xc4b9
ld a, BANK(sMysteryGiftTrainerHouseFlag)
call GetSRAMBank
ld a, [sMysteryGiftTrainerHouseFlag]

2
engine/sprite_anims.asm
View File

@ -404,7 +404,7 @@ DoAnimFrame: ; 8d24b
ret
.ForUnusedCursor ; 8d46e (23:546e)
callfar Ret_e00ed
callfar ret_e00ed
ret
.PokegearArrow ; 8d475 (23:5475)

6
engine/start_menu.asm
View File

@ -25,12 +25,12 @@ StartMenu:: ; 125cd
call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap
farcall LoadFonts_NoOAMUpdate
call .DrawBugContestStatus
call UpdateTimePals
call Special_UpdateTimePals
jr .Select
.Reopen:
call UpdateSprites
call UpdateTimePals
call Special_UpdateTimePals
call .SetUpMenuItems
ld a, [wBattleMenuCursorBuffer]
ld [wMenuCursorBuffer], a
@ -78,7 +78,7 @@ StartMenu:: ; 125cd
call ExitMenu
.ReturnEnd2:
call CloseText
call UpdateTimePals
call Special_UpdateTimePals
ret
.GetInput:

8
engine/timeofdaypals.asm
View File

@ -98,7 +98,7 @@ _TimeOfDayPals:: ; 8c011
ld [rSVBK], a
; update palettes
call _UpdateTimePals
call _Special_UpdateTimePals
call DelayFrame
; successful change
@ -112,14 +112,14 @@ _TimeOfDayPals:: ; 8c011
; 8c070
_UpdateTimePals:: ; 8c070
_Special_UpdateTimePals:: ; 8c070
ld c, $9 ; normal
call GetTimePalFade
call DmgToCgbTimePals
ret
; 8c079
FadeInPalettes:: ; 8c079
Special_FadeInPalettes:: ; 8c079
ld c, $12
call GetTimePalFade
ld b, $4
@ -127,7 +127,7 @@ FadeInPalettes:: ; 8c079
ret
; 8c084
FadeOutPalettes:: ; 8c084
Special_FadeOutPalettes:: ; 8c084
call FillWhiteBGColor
ld c, $9
call GetTimePalFade

8
engine/wildmons.asm
View File

@ -508,7 +508,7 @@ LookUpWildmonsForMapDE: ; 2a288
; 2a2a0
InitRoamMons: ; 2a2a0
Special_InitRoamMons: ; 2a2a0
; initialize wRoamMon structs
; species
@ -804,7 +804,7 @@ ValidateTempWildMonSpecies: ; 2a4a0
; Finds a rare wild Pokemon in the route of the trainer calling, then checks if it's been Seen already.
; The trainer will then tell you about the Pokemon if you haven't seen it.
RandomUnseenWildMon: ; 2a4ab
Special_RandomUnseenWildMon: ; 2a4ab
farcall GetCallerLocation
ld d, b
ld e, c
@ -877,7 +877,7 @@ RandomUnseenWildMon: ; 2a4ab
db "@"
; 0x2a51f
RandomPhoneWildMon: ; 2a51f
Special_RandomPhoneWildMon: ; 2a51f
farcall GetCallerLocation
ld d, b
ld e, c
@ -917,7 +917,7 @@ RandomPhoneWildMon: ; 2a51f
jp CopyBytes
; 2a567
RandomPhoneMon: ; 2a567
Special_RandomPhoneMon: ; 2a567
; Get a random monster owned by the trainer who's calling.
farcall GetCallerLocation
ld hl, TrainerGroups

2
home.asm
View File

@ -793,7 +793,7 @@ ScrollingMenu:: ; 350c
.UpdatePalettes: ; 3524
ld hl, VramState
bit 0, [hl]
jp nz, UpdateTimePals
jp nz, Special_UpdateTimePals
jp SetPalettes
; 352f

6
home/map.asm
View File

@ -1983,7 +1983,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@ -2009,7 +2009,7 @@ FinishExitMenu:: ; 2b5c
call GetSGBLayout
farcall LoadOW_BGPal7
call WaitBGMap2
farcall FadeInPalettes
farcall Special_FadeInPalettes
call EnableSpriteUpdates
ret
; 2b74
@ -2031,7 +2031,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
ld b, SCGB_MAPPALS
call GetSGBLayout
farcall LoadOW_BGPal7
call UpdateTimePals
call Special_UpdateTimePals
call DelayFrame
ld a, $1
ld [hMapAnims], a

4
home/rtc.asm
View File

@ -18,7 +18,7 @@ TimeOfDayPals:: ; 47e
ret
; 485
UpdateTimePals:: ; 485
callfar _UpdateTimePals
Special_UpdateTimePals:: ; 485
callfar _Special_UpdateTimePals
ret
; 48c

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

2
maps/LavenderNameRater.asm
View File

@ -15,7 +15,7 @@ LavenderNameRater_MapScriptHeader:
LavenderNameRater:
faceplayer
opentext
special SpecialNameRater
special Special_NameRater
waitbutton
closetext
end

4
maps/MahoganyTown.asm
View File

@ -53,7 +53,7 @@ UnknownScript_0x190039:
UnknownScript_0x190040:
opentext
writetext UnknownText_0x1900b0
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
yesorno
iffalse UnknownScript_0x190072
checkmoney $0, 300
@ -63,7 +63,7 @@ UnknownScript_0x190040:
waitsfx
playsound SFX_TRANSACTION
takemoney $0, 300
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
writetext UnknownText_0x19014a
waitbutton
closetext

4
maps/ManiasHouse.asm
View File

@ -18,7 +18,7 @@ ManiaScript:
writetext ManiaText_AskLookAfterShuckle
yesorno
iffalse .refusetotakeshuckie
special SpecialGiveShuckle
special Special_GiveShuckle
iffalse .partyfull
writetext ManiaText_TakeCareOfShuckle
buttonsound
@ -54,7 +54,7 @@ ManiaScript:
writetext ManiaText_CanIHaveMyMonBack
yesorno
iffalse .refused
special SpecialReturnShuckle
special Special_ReturnShuckle
if_equal $0, .wrong
if_equal $1, .refused
if_equal $3, .superhappy

4
maps/MobileBattleRoom.asm
View File

@ -33,11 +33,11 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText
pause 20
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
pause 60
special FadeInPalettes
special Special_FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_

2
maps/MoveDeletersHouse.asm
View File

@ -11,7 +11,7 @@ MoveDeletersHouse_MapScriptHeader:
MoveDeleter:
faceplayer
opentext
special MoveDeletion
special Special_MoveDeletion
waitbutton
closetext
end

2
maps/OaksLab.asm
View File

@ -33,7 +33,7 @@ Oak:
.CheckPokedex:
writetext OakLabDexCheckText
waitbutton
special ProfOaksPCBoot
special Special_ProfOaksPCBoot
writetext OakLabGoodbyeText
waitbutton
closetext

4
maps/OlivineCity.asm
View File

@ -45,7 +45,7 @@ UnknownScript_0x1a8833:
disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_LoadUsedSpritesGFX
end
UnknownScript_0x1a886b:
@ -69,7 +69,7 @@ UnknownScript_0x1a886b:
setscene $1
special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_LoadUsedSpritesGFX
end
OlivineCitySailor1Script:

14
maps/OlivineLighthouse6F.asm
View File

@ -47,9 +47,9 @@ UnknownScript_0x60bab:
closetext
special RestartMapMusic
cry AMPHAROS
special FadeOutPalettes
special Special_FadeOutPalettes
pause 10
special FadeInPalettes
special Special_FadeInPalettes
opentext
writetext UnknownText_0x60f3d
waitbutton
@ -109,7 +109,7 @@ MonsterScript_0x60c3a:
iftrue UnknownScript_0x60c51
writetext UnknownText_0x60f03
writebyte AMPHAROS
special PlaySlowCry
special Special_PlaySlowCry
buttonsound
writetext UnknownText_0x60f19
waitbutton
@ -121,10 +121,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
waitbutton
closetext
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special Special_FadeOutPalettes
special Special_FadeInPalettes
special Special_FadeOutPalettes
special Special_FadeInPalettes
end
OlivineLighthouse6FSuperPotion:

2
maps/OlivinePort.asm
View File

@ -46,7 +46,7 @@ SailorScript_0x748c0:
waitsfx
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a

18
maps/Pokecenter2F.asm
View File

@ -107,7 +107,7 @@ LinkReceptionistScript_Trade:
end
.FriendNotReady:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
@ -132,7 +132,7 @@ LinkReceptionistScript_Trade:
.DidNotSave:
writetext Text_PleaseComeAgain
.AbortLink:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
.Cancel:
closetext
end
@ -209,7 +209,7 @@ LinkReceptionistScript_Battle:
end
.FriendNotReady:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
@ -234,7 +234,7 @@ LinkReceptionistScript_Battle:
.DidNotSave:
writetext Text_PleaseComeAgain
.AbortLink:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
.Cancel:
closetext
end
@ -342,7 +342,7 @@ LinkReceptionistScript_TimeCapsule:
end
.FriendNotReady:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
writetext Text_FriendNotReady
closetext
end
@ -354,7 +354,7 @@ LinkReceptionistScript_TimeCapsule:
.DidNotSave:
writetext Text_PleaseComeAgain
.Cancel:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
closetext
end
@ -374,7 +374,7 @@ LinkReceptionistScript_TimeCapsule:
end
Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom
setscene $0
setmapscene TRADE_CENTER, $0
@ -394,7 +394,7 @@ Script_WalkOutOfMobileTradeRoom:
end
Script_LeftCableColosseum:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom
setscene $0
setmapscene COLOSSEUM, $0
@ -558,7 +558,7 @@ TimeCapsuleScript_CheckPlayerGender:
end
Script_LeftTimeCapsule:
special WaitForOtherPlayerToExit
special Special_WaitForOtherPlayerToExit
checkflag ENGINE_KRIS_IN_CABLE_CLUB
iftrue .Female
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight

2
maps/Route27SandstormHouse.asm
View File

@ -13,7 +13,7 @@ SandstormHouseWoman:
opentext
checkevent EVENT_GOT_TM37_SANDSTORM
iftrue .AlreadyGotItem
special GetFirstPokemonHappiness
special Special_GetFirstPokemonHappiness
writetext SandstormHouseWomanText1
buttonsound
if_greater_than $95, .Loyal

10
maps/Route35NationalParkGate.asm
View File

@ -74,7 +74,7 @@ Route35NationalParkGate_MapScriptHeader:
closetext
scall Route35NationalParkGate_EnterContest
playsound SFX_ENTER_DOOR
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
@ -95,7 +95,7 @@ OfficerScript_0x6a204:
iffalse Route35NationalParkGate_DeclinedToParticipate
checkcode VAR_PARTYCOUNT
if_greater_than $1, Route35NationalParkGate_LeaveTheRestBehind
special ContestDropOffMons
special Special_ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
Route35NationalParkGate_OkayToProceed:
setflag ENGINE_BUG_CONTEST_TIMER
@ -111,7 +111,7 @@ Route35NationalParkGate_OkayToProceed:
special Special_GiveParkBalls
scall Route35NationalParkGate_EnterContest
playsound SFX_ENTER_DOOR
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
@ -134,12 +134,12 @@ Route35NationalParkGate_LeaveTheRestBehind:
if_equal 0, Route35NationalParkGate_NoRoomInBox
Route35NationalParkGate_LessThanFullParty: ; 6a27d
special CheckFirstMonIsEgg
special Special_CheckFirstMonIsEgg
if_equal $1, Route35NationalParkGate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno
iffalse Route35NationalParkGate_DeclinedToLeaveMonsBehind
special ContestDropOffMons
special Special_ContestDropOffMons
iftrue Route35NationalParkGate_FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6a537

2
maps/Route36.asm
View File

@ -94,7 +94,7 @@ DidntCatchSudowoodo:
applymovement ROUTE36_WEIRD_TREE, WeirdTreeMovement_Flee
disappear ROUTE36_WEIRD_TREE
variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
special MapCallbackSprites_LoadUsedSpritesGFX
special Special_MapCallbackSprites_LoadUsedSpritesGFX
special RefreshSprites
end

10
maps/Route36NationalParkGate.asm
View File

@ -91,7 +91,7 @@ Route36NationalParkGate_MapScriptHeader:
closetext
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
@ -156,7 +156,7 @@ Route36OfficerScriptContest:
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than $1, .LeaveMonsWithOfficer
special ContestDropOffMons
special Special_ContestDropOffMons
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
@ -174,7 +174,7 @@ Route36OfficerScriptContest:
special Special_GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
@ -186,12 +186,12 @@ Route36OfficerScriptContest:
checkcode VAR_BOXSPACE
if_equal $0, .BoxFull
.ContinueLeavingMons:
special CheckFirstMonIsEgg
special Special_CheckFirstMonIsEgg
if_equal $1, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse .RefusedToLeaveMons
special ContestDropOffMons
special Special_ContestDropOffMons
iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021

2
maps/Route39Barn.asm
View File

@ -52,7 +52,7 @@ MooMoo:
iftrue .HappyCow
writetext Text_WeakMoo
writebyte MILTANK
special PlaySlowCry
special Special_PlaySlowCry
buttonsound
writetext Text_ItsCryIsWeak
checkevent EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO

4
maps/Route39Farmhouse.asm
View File

@ -24,7 +24,7 @@ FarmerMScript_SellMilk:
checkitem MOOMOO_MILK
iftrue FarmerMScript_Milking
writetext FarmerMText_BuyMilk
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
yesorno
iffalse FarmerMScript_NoSale
checkmoney $0, 500
@ -32,7 +32,7 @@ FarmerMScript_SellMilk:
giveitem MOOMOO_MILK
iffalse FarmerMScript_NoRoom
takemoney $0, 500
special PlaceMoneyTopRight
special Special_PlaceMoneyTopRight
waitsfx
playsound SFX_TRANSACTION
writetext FarmerMText_GotMilk

2
maps/SlowpokeWellB1F.asm
View File

@ -67,7 +67,7 @@ TrainerGruntM1:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
special FadeOutPalettes
special Special_FadeOutPalettes
special HealParty
pause 15
warp KURTS_HOUSE, $3, $3

12
maps/TeamRocketBaseB1F.asm
View File

@ -448,9 +448,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
special FadeOutPalettes
special Special_FadeOutPalettes
cry VOLTORB
special FadeInPalettes
special Special_FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon VOLTORB, 23
@ -458,9 +458,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
special FadeOutPalettes
special Special_FadeOutPalettes
cry GEODUDE
special FadeInPalettes
special Special_FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon GEODUDE, 21
@ -468,9 +468,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
special FadeOutPalettes
special Special_FadeOutPalettes
cry KOFFING
special FadeInPalettes
special Special_FadeInPalettes
setlasttalked -1
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadwildmon KOFFING, 21

4
maps/TeamRocketBaseB2F.asm
View File

@ -166,11 +166,11 @@ LanceHealsCommon:
writetext LanceHealsText1
waitbutton
closetext
special FadeOutPalettes
special Special_FadeOutPalettes
special TrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
special FadeInPalettes
special Special_FadeInPalettes
opentext
writetext LanceHealsText2
waitbutton

4
maps/TrainerHouseB1F.asm
View File

@ -20,7 +20,7 @@ TrainerHouseReceptionistScript:
iftrue .FoughtTooManyTimes
writetext TrainerHouseB1FIntroText
buttonsound
special SpecialTrainerHouse
special Special_TrainerHouse
iffalse .GetCal3Name
trainertotext CAL, CAL2, $0
jump .GotName
@ -42,7 +42,7 @@ TrainerHouseReceptionistScript:
writetext TrainerHouseB1FCalBeforeText
waitbutton
closetext
special SpecialTrainerHouse
special Special_TrainerHouse
iffalse .NoSpecialBattle
winlosstext TrainerHouseB1FCalBeatenText, 0
setlasttalked TRAINERHOUSEB1F_CHRIS

2
maps/VermilionCity.asm
View File

@ -42,7 +42,7 @@ VermilionCitySuperNerdScript:
VermilionSnorlax:
opentext
special SpecialSnorlaxAwake
special Special_SnorlaxAwake
iftrue UnknownScript_0x1aa9ab
writetext UnknownText_0x1aab64
waitbutton

2
maps/VermilionPort.asm
View File

@ -52,7 +52,7 @@ SailorScript_0x74dc4:
waitsfx
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special Special_FadeOutPalettes
waitsfx
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

2
mobile/mobile_40.asm
View File

@ -318,7 +318,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
farcall Function106464
call HideSprites
call DelayFrame