ref: 4bcd71e3227181baa536357af3d87a8d02af3890
parent: 0c6f94effd1cb4278b0c0a2f02117055a69537e1
author: PikalaxALT <PikalaxALT@gmail.com>
date: Thu Nov 26 16:06:32 EST 2015
Fix some labels in engine/timeofdaypals.asm
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -272,8 +272,8 @@
dba LoadMapAttributes ; 1a
dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c
- dba RotatePalettesRightPalettes ; 1d
- dba RotatePalettesLeftPalettes ; 1e
+ dba FadeOutPalettes ; 1d
+ dba FadeInPalettes ; 1e
dba GetCoordOfUpperLeftCorner ; 1f
dba RestoreFacingAfterWarp ; 20
dba SpawnInFacingDown ; 21
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -66,11 +66,11 @@
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen
- add_special RotatePalettesRightPalettes
+ add_special FadeOutPalettes
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
- add_special RotatePalettesLeftPalettes
- add_special Special_RotatePalettesLeftQuickly
+ add_special FadeInPalettes
+ add_special Special_FadeInQuickly
add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes
add_special UpdateTimePals
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -116,7 +116,7 @@
ret
; 8c079
-RotatePalettesLeftPalettes:: ; 8c079
+FadeInPalettes:: ; 8c079
ld c, $12
call GetTimePalFade
ld b, $4
@@ -124,7 +124,7 @@
ret
; 8c084
-RotatePalettesRightPalettes:: ; 8c084
+FadeOutPalettes:: ; 8c084
call Function8c0c1
ld c, $9
call GetTimePalFade
@@ -150,7 +150,7 @@
ret
; 8c0ab
-Special_RotatePalettesLeftQuickly: ; 8c0ab
+Special_FadeInQuickly: ; 8c0ab
ld c, $0
call GetTimePalFade
ld b, $4
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -7,7 +7,7 @@
; 8c7e1
BlindingFlash: ; 8c7e1
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
ld hl, StatusFlags
set 2, [hl]
callba Function8c0e5
@@ -15,7 +15,7 @@
ld b, SCGB_09
call GetSGBLayout
callba Function49409
- callba RotatePalettesLeftPalettes
+ callba FadeInPalettes
ret
; 8c80a
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -40,7 +40,7 @@
ld [MusicFadeIDHi], a
ld a, $a
ld [MusicFade], a
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
@@ -63,7 +63,7 @@
ld [MusicFadeIDHi], a
ld a, 10
ld [MusicFade], a
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
--- a/event/sacred_ash.asm
+++ b/event/sacred_ash.asm
@@ -52,12 +52,12 @@
special HealParty
reloadmappart
playsound SFX_WARP_TO
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
waitbutton
writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON
--- a/event/whiteout.asm
+++ b/event/whiteout.asm
@@ -10,7 +10,7 @@
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
closetext
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
--- a/home/map.asm
+++ b/home/map.asm
@@ -2007,7 +2007,7 @@
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@@ -2034,7 +2034,7 @@
call GetSGBLayout
callba Function49409
call Function3200
- callba RotatePalettesLeftPalettes
+ callba FadeInPalettes
call EnableSpriteUpdates
ret
; 2b74
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -31,7 +31,7 @@
keeptextopen
loadmovesprites
special BattleTowerBattle ; calls predef startbattle
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
@@ -46,10 +46,10 @@
closetext
loadmovesprites
playmusic MUSIC_HEAL
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
special LoadMapPalettes
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext Text_NextUpOpponentNo
@@ -73,7 +73,7 @@
special BattleTowerAction
playsound SFX_SAVE
waitbutton
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@@ -84,7 +84,7 @@
writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -30,10 +30,10 @@
writetext UnknownText_0x19b266
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -84,7 +84,7 @@
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playsound SFX_ENTER_DOOR
waitbutton
warp ECRUTEAK_CITY, $6, $1b
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -64,7 +64,7 @@
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger VERMILION_PORT, $1
@@ -77,7 +77,7 @@
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -43,7 +43,7 @@
appear $4
spriteface PLAYER, UP
spriteface $4, UP
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
spriteface $3, DOWN
showemote EMOTE_SHOCK, $3, 15
applymovement $4, MovementData_0x7600c
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -70,7 +70,7 @@
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
loadfont
writetext FastShipBedText2
closetext
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -154,7 +154,7 @@
closetext
loadmovesprites
playsound SFX_WARP_TO
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
warp NEW_BARK_TOWN, $d, $6
end
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -125,7 +125,7 @@
pause 30
loadmovesprites
applymovement $3, MovementData_0x180f5b
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -35,11 +35,11 @@
writetext MobileBattleRoom_HealText
pause 20
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
refreshscreen $0
.two_:
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -114,7 +114,7 @@
special Mobile_HealParty
special HealParty
pause 60
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x197134
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -42,9 +42,9 @@
loadmovesprites
special RestartMapMusic
cry AMPHAROS
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 10
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
loadfont
writetext UnknownText_0x60f3d
closetext
@@ -116,10 +116,10 @@
cry AMPHAROS
closetext
loadmovesprites
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
end
ItemFragment_0x60c66:
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -39,7 +39,7 @@
waitbutton
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -95,7 +95,7 @@
disappear $3
disappear $4
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -29,7 +29,7 @@
special Special_ReloadSpritesNoPalettes
disappear $2
pause 25
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
playmapmusic
end
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -17,7 +17,7 @@
playmusic MUSIC_HEAL
special HealParty
pause 60
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x7b18b
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -75,7 +75,7 @@
loadmovesprites
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
@@ -112,7 +112,7 @@
special Special_GiveParkBalls
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -74,7 +74,7 @@
appear $d
applymovement PLAYER, MovementData_0x6add1
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
jumpstd bugcontestresults
.GoBackToContest:
@@ -83,7 +83,7 @@
loadmovesprites
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
@@ -166,7 +166,7 @@
special Special_GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -26,7 +26,7 @@
special Special_ReloadSpritesNoPalettes
disappear $2
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
pause 30
special HealParty
refreshscreen $0
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -34,7 +34,7 @@
disappear $4
disappear $5
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
disappear $8
moveperson $8, $b, $6
appear $8
@@ -56,7 +56,7 @@
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
special HealParty
pause 15
warp KURTS_HOUSE, $3, $3
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -51,7 +51,7 @@
special Special_ReloadSpritesNoPalettes
disappear $8
waitbutton
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
dotrigger $1
special RestartMapMusic
end
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -445,9 +445,9 @@
end
VoltorbExplodingTrap:
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
cry VOLTORB
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@@ -455,9 +455,9 @@
end
GeodudeExplodingTrap:
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
cry GEODUDE
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@@ -465,9 +465,9 @@
end
KoffingExplodingTrap:
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
cry KOFFING
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -106,7 +106,7 @@
disappear $d
disappear $e
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
dotrigger $2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface $4, DOWN
@@ -155,11 +155,11 @@
writetext UnknownText_0x6da97
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
special Mobile_HealParty
playsound SFX_FULL_HEAL
special HealParty
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
loadfont
writetext UnknownText_0x6daf7
closetext
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -51,7 +51,7 @@
waitbutton
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -226,10 +226,10 @@
writetext UnknownText_0x7c6b8
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c6d8
@@ -309,10 +309,10 @@
writetext UnknownText_0x7c80e
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c82a
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -313,7 +313,7 @@
Function10020b: ; 10020b
xor a
ld [wc303], a
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
callba Function106464
call HideSprites
call DelayFrame
--
⑨