diff options
Diffstat (limited to 'maps/FightingDojo.asm')
| -rw-r--r-- | maps/FightingDojo.asm | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 46cc7ddeb..dde645d75 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks FightingDojoBlackBelt: jumptextfaceplayer FightingDojoBlackBeltText @@ -43,23 +41,18 @@ FightingDojoSign1Text: done FightingDojo_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 11, 1, SAFFRON_CITY - warp_def 5, 11, 1, SAFFRON_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script - bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script - -.ObjectEvents: - db 2 - object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 11, SAFFRON_CITY, 1 + warp_event 5, 11, SAFFRON_CITY, 1 + + db 0 ; coord events + + db 2 ; bg events + bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script + + db 2 ; object events + object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 + object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND |