summaryrefslogtreecommitdiff
path: root/maps/LavRadioTower1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/LavRadioTower1F.asm')
-rw-r--r--maps/LavRadioTower1F.asm49
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index d16bce5f1..073dbb821 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -1,4 +1,4 @@
-const_value set 2
+ const_def 2 ; object constants
const LAVRADIOTOWER1F_RECEPTIONIST
const LAVRADIOTOWER1F_OFFICER
const LAVRADIOTOWER1F_SUPER_NERD1
@@ -6,11 +6,9 @@ const_value set 2
const LAVRADIOTOWER1F_SUPER_NERD2
LavRadioTower1F_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
LavRadioTower1FReceptionistScript:
jumptextfaceplayer LavRadioTower1FReceptionistText
@@ -222,26 +220,21 @@ UnknownText_0x7f36b:
done
LavRadioTower1F_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 7, LAVENDER_TOWN
- warp_def 3, 7, 7, LAVENDER_TOWN
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
- bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
-
-.ObjectEvents:
- db 5
- object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
- object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
- object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
- object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
- object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+ db 0, 0 ; filler
+
+ db 2 ; warp events
+ warp_event 2, 7, LAVENDER_TOWN, 7
+ warp_event 3, 7, LAVENDER_TOWN, 7
+
+ db 0 ; coord events
+
+ db 2 ; bg events
+ bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
+ bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
+
+ db 5 ; object events
+ object_event 6, 6, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
+ object_event 15, 1, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
+ object_event 1, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
+ object_event 9, 1, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
+ object_event 14, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1