summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB1F.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
commitbef792f2d21ccac0127aeffd9e0838aba81f44b6 (patch)
tree22185c93e9f9dcc3937a5e96279dd71f3b24c0d8 /maps/TeamRocketBaseB1F.asm
parent94129b6b451fc7770ea75ffbdcbaab4967f513bd (diff)
More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
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 635634df0..d2173a859 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -445,9 +445,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
- special Function8c084
+ special FadeBlackBGMap
cry VOLTORB
- special Function8c079
+ special FadeInBGMap
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
- special Function8c084
+ special FadeBlackBGMap
cry GEODUDE
- special Function8c079
+ special FadeInBGMap
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
- special Function8c084
+ special FadeBlackBGMap
cry KOFFING
- special Function8c079
+ special FadeInBGMap
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21