summaryrefslogtreecommitdiff
path: root/maps/VioletOnixTradeHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/VioletOnixTradeHouse.asm')
-rw-r--r--maps/VioletOnixTradeHouse.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm
index 7d237a77a..c92b5632a 100644
--- a/maps/VioletOnixTradeHouse.asm
+++ b/maps/VioletOnixTradeHouse.asm
@@ -1,8 +1,8 @@
VioletOnixTradeHouse_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
PokefanMScript_0x6998d:
@@ -32,18 +32,18 @@ VioletOnixTradeHouse_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $3, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
warp_def $7, $4, 6, GROUP_VIOLET_CITY, MAP_VIOLET_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, -1
- person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, -1
+ person_event SPRITE_POKEFAN_M, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, PokefanMScript_0x6998d, -1
+ person_event SPRITE_YOUNGSTER, 9, 10, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69990, -1