summaryrefslogtreecommitdiff
path: root/maps/DarkCaveVioletEntrance.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/DarkCaveVioletEntrance.asm')
-rw-r--r--maps/DarkCaveVioletEntrance.asm14
1 files changed, 6 insertions, 8 deletions
diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm
index 06b3fdf27..865b034e9 100644
--- a/maps/DarkCaveVioletEntrance.asm
+++ b/maps/DarkCaveVioletEntrance.asm
@@ -22,9 +22,8 @@ ItemFragment_0x18c694: ; 0x18c694
db DIRE_HIT, 1
; 0x18c696
-RockScript_0x18c696: ; 0x18c696
- jumpstd $000f
-; 0x18c699
+DarkCaveVioletEntranceRock:
+ jumpstd smashrock
MapDarkCaveVioletEntranceSignpostItem0: ; 0x18c699
dw $009d
@@ -52,12 +51,11 @@ DarkCaveVioletEntrance_MapEventHeader: ; 0x18c69c
; people-events
db 8
person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, $069e
- person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
- person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, RockScript_0x18c696, $ffff
+ person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
+ person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, $ffff
person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, $069f
person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, $06a0
person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, $07ce
; 0x18c71e
-