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/Route30BerrySpeechHouse.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/Route30BerrySpeechHouse.asm')
| -rw-r--r-- | maps/Route30BerrySpeechHouse.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 55dbff282..a912fd529 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -52,17 +52,17 @@ Route30BerrySpeechHouse_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, ROUTE_30 - warp_def $7, $3, 1, ROUTE_30 + warp_def 2, 7, 1, ROUTE_30 + warp_def 3, 7, 1, ROUTE_30 .CoordEvents: db 0 .BGEvents: db 2 - bg_event 1, 0, BGEVENT_READ, Route30BerrySpeechHouseBookshelf + bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf .ObjectEvents: db 1 - object_event SPRITE_POKEFAN_M, 3, 2, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 + object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanMScript_0x196d64, -1 |