summaryrefslogtreecommitdiff
path: root/maps/SlowpokeWellB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SlowpokeWellB2F.asm')
-rw-r--r--maps/SlowpokeWellB2F.asm29
1 files changed, 11 insertions, 18 deletions
diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm
index c8559cc9c..21a8f73e4 100644
--- a/maps/SlowpokeWellB2F.asm
+++ b/maps/SlowpokeWellB2F.asm
@@ -1,13 +1,11 @@
-const_value set 2
+ const_def 2 ; object constants
const SLOWPOKEWELLB2F_GYM_GUY
const SLOWPOKEWELLB2F_POKE_BALL
SlowpokeWellB2F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
GymGuyScript_0x5ad0b:
faceplayer
@@ -62,20 +60,15 @@ UnknownText_0x5adf2:
done
SlowpokeWellB2F_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 1
- warp_def 9, 11, 2, SLOWPOKE_WELL_B1F
+ db 1 ; warp events
+ warp_event 9, 11, SLOWPOKE_WELL_B1F, 2
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 2
- object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
- object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE
+ db 2 ; object events
+ object_event 5, 4, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 1, GymGuyScript_0x5ad0b, -1
+ object_event 15, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SlowpokeWellB2FTMRainDance, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE