summaryrefslogtreecommitdiff
path: root/maps/LavRadioTower1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/LavRadioTower1F.asm')
-rw-r--r--maps/LavRadioTower1F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 29f1cfc91..6a15dd7df 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -6,7 +6,7 @@ const_value set 2
const LAVRADIOTOWER1F_SUPER_NERD2
LavRadioTower1F_MapScriptHeader:
-.MapTriggers:
+.SceneScripts:
db 0
.MapCallbacks:
@@ -230,18 +230,18 @@ LavRadioTower1F_MapEventHeader:
warp_def $7, $2, 7, LAVENDER_TOWN
warp_def $7, $3, 7, LAVENDER_TOWN
-.XYTriggers:
+.CoordEvents:
db 0
-.Signposts:
+.BGEvents:
db 2
- signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script
- signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script
+ bg_event 0, 11, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
+ bg_event 0, 5, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
-.PersonEvents:
+.ObjectEvents:
db 5
- person_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
- person_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
- person_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
- person_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
- person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1
+ object_event SPRITE_RECEPTIONIST, 6, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FReceptionistScript, -1
+ object_event SPRITE_OFFICER, 1, 15, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FOfficerScript, -1
+ object_event SPRITE_SUPER_NERD, 3, 1, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LavRadioTower1FSuperNerdScript, -1
+ object_event SPRITE_GENTLEMAN, 1, 9, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7ee6c, -1
+ object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x7eea2, -1