summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-26 21:06:32 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-26 21:06:32 -0500
commit4bcd71e3227181baa536357af3d87a8d02af3890 (patch)
tree05f5dd861966762db9556082229cee82e8b5eed9
parent0c6f94effd1cb4278b0c0a2f02117055a69537e1 (diff)
Fix some labels in engine/timeofdaypals.asm
-rw-r--r--engine/map_setup.asm4
-rw-r--r--engine/specials.asm6
-rw-r--r--engine/timeofdaypals.asm6
-rwxr-xr-xevent/field_moves.asm4
-rwxr-xr-xevent/halloffame.asm4
-rwxr-xr-xevent/sacred_ash.asm12
-rwxr-xr-xevent/whiteout.asm2
-rw-r--r--home/map.asm4
-rw-r--r--maps/BattleTowerBattleRoom.asm10
-rw-r--r--maps/BluesHouse.asm4
-rw-r--r--maps/EcruteakGym.asm2
-rw-r--r--maps/FastShip1F.asm4
-rw-r--r--maps/FastShipCabins_SE_SSE_CaptainsCabin.asm2
-rw-r--r--maps/FastShipCabins_SW_SSW_NW.asm2
-rw-r--r--maps/IndigoPlateauPokeCenter1F.asm2
-rw-r--r--maps/LancesRoom.asm2
-rw-r--r--maps/MobileBattleRoom.asm4
-rw-r--r--maps/MrPokemonsHouse.asm2
-rw-r--r--maps/OlivineLighthouse6F.asm12
-rw-r--r--maps/OlivinePort.asm2
-rw-r--r--maps/RadioTower5F.asm2
-rw-r--r--maps/Route24.asm2
-rw-r--r--maps/Route26HealSpeechHouse.asm2
-rw-r--r--maps/Route35NationalParkgate.asm4
-rw-r--r--maps/Route36NationalParkgate.asm6
-rw-r--r--maps/SilverCaveRoom3.asm2
-rw-r--r--maps/SlowpokeWellB1F.asm4
-rw-r--r--maps/SproutTower3F.asm2
-rw-r--r--maps/TeamRocketBaseB1F.asm12
-rw-r--r--maps/TeamRocketBaseB2F.asm6
-rw-r--r--maps/VermilionPort.asm2
-rw-r--r--maps/WarehouseEntrance.asm8
-rw-r--r--misc/mobile_40.asm2
33 files changed, 72 insertions, 72 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index ef1ad715e..7444c7fbe 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -272,8 +272,8 @@ MapSetupCommands: ; 15440
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
diff --git a/engine/specials.asm b/engine/specials.asm
index e2b4e6195..09edbb263 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -66,11 +66,11 @@ SpecialsPointers:: ; c029
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
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index b977772eb..368636758 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070
ret
; 8c079
-RotatePalettesLeftPalettes:: ; 8c079
+FadeInPalettes:: ; 8c079
ld c, $12
call GetTimePalFade
ld b, $4
@@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079
ret
; 8c084
-RotatePalettesRightPalettes:: ; 8c084
+FadeOutPalettes:: ; 8c084
call Function8c0c1
ld c, $9
call GetTimePalFade
@@ -150,7 +150,7 @@ endr
ret
; 8c0ab
-Special_RotatePalettesLeftQuickly: ; 8c0ab
+Special_FadeInQuickly: ; 8c0ab
ld c, $0
call GetTimePalFade
ld b, $4
diff --git a/event/field_moves.asm b/event/field_moves.asm
index e12709b1e..d6fa4a0bb 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1
BlindingFlash: ; 8c7e1
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
ld hl, StatusFlags
set 2, [hl]
callba Function8c0e5
@@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_09
call GetSGBLayout
callba Function49409
- callba RotatePalettesLeftPalettes
+ callba FadeInPalettes
ret
; 8c80a
diff --git a/event/halloffame.asm b/event/halloffame.asm
index 9aa088495..d4b86286d 100755
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -40,7 +40,7 @@ RedCredits:: ; 86455
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 @@ Function8648e: ; 8648e
ld [MusicFadeIDHi], a
ld a, 10
ld [MusicFade], a
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
diff --git a/event/sacred_ash.asm b/event/sacred_ash.asm
index 1b0a4e244..00b80bb46 100755
--- a/event/sacred_ash.asm
+++ b/event/sacred_ash.asm
@@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
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
diff --git a/event/whiteout.asm b/event/whiteout.asm
index cc42714d0..2e8774b8f 100755
--- a/event/whiteout.asm
+++ b/event/whiteout.asm
@@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
closetext
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
diff --git a/home/map.asm b/home/map.asm
index d50c99349..e385517a1 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@@ -2034,7 +2034,7 @@ Function2b5c:: ; 2b5c
call GetSGBLayout
callba Function49409
call Function3200
- callba RotatePalettesLeftPalettes
+ callba FadeInPalettes
call EnableSpriteUpdates
ret
; 2b74
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 07e0b8016..858b51fb0 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425
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 @@ Script_BattleRoomLoop: ; 0x9f425
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 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitbutton
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@@ -84,7 +84,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm
index f15cbd1f3..36d06b943 100644
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 2e205fa8a..f3e136c9d 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playsound SFX_ENTER_DOOR
waitbutton
warp ECRUTEAK_CITY, $6, $1b
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index ec41829db..be1675a1b 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -64,7 +64,7 @@ SailorScript_0x75160:
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 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 69a499841..70759c740 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -43,7 +43,7 @@ TwinScript_0x75ebb:
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
diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm
index c459b1e7e..493ee070e 100644
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -70,7 +70,7 @@ FastShipBed:
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
loadfont
writetext FastShipBedText2
closetext
diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm
index 5cce7f36c..6595cc0a9 100644
--- a/maps/IndigoPlateauPokeCenter1F.asm
+++ b/maps/IndigoPlateauPokeCenter1F.asm
@@ -154,7 +154,7 @@ TeleportGuyScript:
closetext
loadmovesprites
playsound SFX_WARP_TO
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
warp NEW_BARK_TOWN, $d, $6
end
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 549baf320..0a89ea3a7 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
loadmovesprites
applymovement $3, MovementData_0x180f5b
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 44ee3a5b1..c672c3b69 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
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_:
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index cc1f22f21..aeac05928 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -114,7 +114,7 @@ UnknownScript_0x196ec9:
special Mobile_HealParty
special HealParty
pause 60
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x197134
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index b8986bad8..aae5ed42e 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -42,9 +42,9 @@ UnknownScript_0x60bab:
loadmovesprites
special RestartMapMusic
cry AMPHAROS
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
pause 10
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
loadfont
writetext UnknownText_0x60f3d
closetext
@@ -116,10 +116,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
closetext
loadmovesprites
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
- special RotatePalettesRightPalettes
- special RotatePalettesLeftPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
+ special FadeOutPalettes
+ special FadeInPalettes
end
ItemFragment_0x60c66:
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 39d77694f..38941d295 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -39,7 +39,7 @@ SailorScript_0x748c0:
waitbutton
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
waitbutton
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index 3f1b16882..32a363e55 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -95,7 +95,7 @@ UnknownScript_0x6006e:
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
diff --git a/maps/Route24.asm b/maps/Route24.asm
index 0e6467288..b828c9e89 100644
--- a/maps/Route24.asm
+++ b/maps/Route24.asm
@@ -29,7 +29,7 @@ RocketScript_0x1adbfa:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 25
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
playmapmusic
end
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm
index e187b09d4..785daaeb2 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -17,7 +17,7 @@ TeacherScript_0x7b125:
playmusic MUSIC_HEAL
special HealParty
pause 60
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x7b18b
diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm
index 005b1f1fd..ba5c3516a 100644
--- a/maps/Route35NationalParkgate.asm
+++ b/maps/Route35NationalParkgate.asm
@@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
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 @@ Route35NationalParkgate_OkayToProceed:
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
diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm
index 495ef1856..03c8c2474 100644
--- a/maps/Route36NationalParkgate.asm
+++ b/maps/Route36NationalParkgate.asm
@@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader:
appear $d
applymovement PLAYER, MovementData_0x6add1
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
jumpstd bugcontestresults
.GoBackToContest:
@@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader:
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 @@ Route36OfficerScriptContest:
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
diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm
index b01588ba6..08831af22 100644
--- a/maps/SilverCaveRoom3.asm
+++ b/maps/SilverCaveRoom3.asm
@@ -26,7 +26,7 @@ RedScript_0x18c603:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
pause 30
special HealParty
refreshscreen $0
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index 1d98bf807..27b397543 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -34,7 +34,7 @@ GruntM1Script:
disappear $4
disappear $5
pause 15
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
disappear $8
moveperson $8, $b, $6
appear $8
@@ -56,7 +56,7 @@ GruntM1Script:
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
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 06c85c22b..c8a1216a8 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -51,7 +51,7 @@ UnknownScript_0x184947:
special Special_ReloadSpritesNoPalettes
disappear $8
waitbutton
- special Special_RotatePalettesLeftQuickly
+ special Special_FadeInQuickly
dotrigger $1
special RestartMapMusic
end
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 5bd666972..e9e68a97d 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -445,9 +445,9 @@ ExplodingTrap22:
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 @@ VoltorbExplodingTrap:
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 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
cry KOFFING
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 39b8ea4fc..2a44c4652 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -106,7 +106,7 @@ UnknownScript_0x6cfac:
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 @@ UnknownScript_0x6d091:
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
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index fd48206eb..c9cb32207 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -51,7 +51,7 @@ SailorScript_0x74dc4:
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
diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm
index 12b9ae2d6..2ef14fcc0 100644
--- a/maps/WarehouseEntrance.asm
+++ b/maps/WarehouseEntrance.asm
@@ -226,10 +226,10 @@ OlderHaircutBrotherScript:
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 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c80e
closetext
loadmovesprites
- special RotatePalettesRightPalettes
+ special FadeOutPalettes
playmusic MUSIC_HEAL
pause 60
- special RotatePalettesLeftPalettes
+ special FadeInPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c82a
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 00581de06..9b98046c0 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -313,7 +313,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
- callba RotatePalettesRightPalettes
+ callba FadeOutPalettes
callba Function106464
call HideSprites
call DelayFrame