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/ViridianGym.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/ViridianGym.asm')
| -rw-r--r-- | maps/ViridianGym.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 3be7a126e..bf6a99290 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -175,18 +175,18 @@ ViridianGym_MapEventHeader: .Warps: db 2 - warp_def $11, $4, 1, VIRIDIAN_CITY - warp_def $11, $5, 1, VIRIDIAN_CITY + warp_def 4, 17, 1, VIRIDIAN_CITY + warp_def 5, 17, 1, VIRIDIAN_CITY .CoordEvents: db 0 .BGEvents: db 2 - bg_event 13, 3, BGEVENT_READ, ViridianGymStatue - bg_event 13, 6, BGEVENT_READ, ViridianGymStatue + bg_event 3, 13, BGEVENT_READ, ViridianGymStatue + bg_event 6, 13, BGEVENT_READ, ViridianGymStatue .ObjectEvents: db 2 - object_event SPRITE_BLUE, 3, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE - object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 5, 3, SPRITE_BLUE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ViridianGymBlueScript, EVENT_VIRIDIAN_GYM_BLUE + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE |