summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB1F.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-11-11 23:38:57 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-11-11 23:38:57 -0500
commit2ffcb4b49036b8bcd9a37cdc9305f7ee5567fe6c (patch)
tree0c9fe148771ade8ef1948852722b95b378cbe46f /maps/TeamRocketBaseB1F.asm
parent91068077f05afbbfd6571ceadada2c03ac7c8038 (diff)
More splits; map setup labels
Diffstat (limited to 'maps/TeamRocketBaseB1F.asm')
-rw-r--r--maps/TeamRocketBaseB1F.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 3a03b67a2..29ca078b8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -445,9 +445,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry VOLTORB
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry GEODUDE
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
- special FadeBlackBGMap
+ special FadeOutPalettes
cry KOFFING
- special FadeInBGMap
+ special FadeInPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21