summaryrefslogtreecommitdiff
path: root/maps/LavRadioTower1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/LavRadioTower1F.asm')
-rw-r--r--maps/LavRadioTower1F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm
index 6a15dd7df..424a802c9 100644
--- a/maps/LavRadioTower1F.asm
+++ b/maps/LavRadioTower1F.asm
@@ -227,21 +227,21 @@ LavRadioTower1F_MapEventHeader:
.Warps:
db 2
- warp_def $7, $2, 7, LAVENDER_TOWN
- warp_def $7, $3, 7, LAVENDER_TOWN
+ warp_def 2, 7, 7, LAVENDER_TOWN
+ warp_def 3, 7, 7, LAVENDER_TOWN
.CoordEvents:
db 0
.BGEvents:
db 2
- bg_event 0, 11, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
- bg_event 0, 5, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
+ bg_event 11, 0, BGEVENT_READ, MapLavRadioTower1FSignpost0Script
+ bg_event 5, 0, BGEVENT_READ, MapLavRadioTower1FSignpost1Script
.ObjectEvents:
db 5
- 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
+ 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