diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
| commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
| tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/FightingDojo.asm | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
| parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) | |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/FightingDojo.asm')
| -rw-r--r-- | maps/FightingDojo.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 9507e9a26..01cdea5b5 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -48,18 +48,18 @@ FightingDojo_MapEventHeader: .Warps: db 2 - warp_def $b, $4, 1, SAFFRON_CITY - warp_def $b, $5, 1, SAFFRON_CITY + warp_def 4, 11, 1, SAFFRON_CITY + warp_def 5, 11, 1, SAFFRON_CITY .CoordEvents: db 0 .BGEvents: db 2 - bg_event 0, 4, BGEVENT_READ, MapFightingDojoSignpost0Script - bg_event 0, 5, BGEVENT_READ, MapFightingDojoSignpost1Script + bg_event 4, 0, BGEVENT_READ, MapFightingDojoSignpost0Script + bg_event 5, 0, BGEVENT_READ, MapFightingDojoSignpost1Script .ObjectEvents: db 2 - object_event SPRITE_BLACK_BELT, 4, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 - object_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND + 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 |