summaryrefslogtreecommitdiff
path: root/maps/FightingDojo.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/FightingDojo.asm')
-rw-r--r--maps/FightingDojo.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm
index 34c909c06..ce0515e79 100644
--- a/maps/FightingDojo.asm
+++ b/maps/FightingDojo.asm
@@ -1,8 +1,8 @@
FightingDojo_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
BlackBeltScript_0x189b61:
@@ -42,20 +42,20 @@ FightingDojo_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $b, $4, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $b, $5, 1, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 0, 4, $0, MapFightingDojoSignpost0Script
- signpost 0, 5, $0, MapFightingDojoSignpost1Script
+ signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script
+ signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, -1
- person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND
+ person_event SPRITE_BLACK_BELT, 8, 8, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1
+ person_event SPRITE_POKE_BALL, 5, 7, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND