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/VioletGym.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/VioletGym.asm')
| -rw-r--r-- | maps/VioletGym.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 239cdcd7a..84effea16 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -287,20 +287,20 @@ VioletGym_MapEventHeader: .Warps: db 2 - warp_def $f, $4, 2, VIOLET_CITY - warp_def $f, $5, 2, VIOLET_CITY + warp_def 4, 15, 2, VIOLET_CITY + warp_def 5, 15, 2, VIOLET_CITY .CoordEvents: db 0 .BGEvents: db 2 - bg_event 13, 3, BGEVENT_READ, VioletGymStatue - bg_event 13, 6, BGEVENT_READ, VioletGymStatue + bg_event 3, 13, BGEVENT_READ, VioletGymStatue + bg_event 6, 13, BGEVENT_READ, VioletGymStatue .ObjectEvents: db 4 - object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 - object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 - object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 + object_event 5, 1, SPRITE_FALKNER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 + object_event 7, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_LEFT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 + object_event 2, 10, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 + object_event 7, 13, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1 |