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/Route39Farmhouse.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/Route39Farmhouse.asm')
| -rw-r--r-- | maps/Route39Farmhouse.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index 194a43312..77531a70d 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -198,18 +198,18 @@ Route39Farmhouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, ROUTE_39 - warp_def $7, $3, 2, ROUTE_39 + warp_def 2, 7, 2, ROUTE_39 + warp_def 3, 7, 2, ROUTE_39 .CoordEvents: db 0 .BGEvents: db 2 - bg_event 1, 0, BGEVENT_READ, FarmhouseBookshelf + bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf .ObjectEvents: db 2 - object_event SPRITE_POKEFAN_M, 2, 3, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 - object_event SPRITE_POKEFAN_F, 4, 5, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 + object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1 + object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1 |