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/PewterGym.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/PewterGym.asm')
| -rw-r--r-- | maps/PewterGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 524113ba3..ca94d9e9f 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -214,19 +214,19 @@ PewterGym_MapEventHeader: .Warps: db 2 - warp_def $d, $4, 2, PEWTER_CITY - warp_def $d, $5, 2, PEWTER_CITY + warp_def 4, 13, 2, PEWTER_CITY + warp_def 5, 13, 2, PEWTER_CITY .CoordEvents: db 0 .BGEvents: db 2 - bg_event 11, 2, BGEVENT_READ, PewterGymStatue - bg_event 11, 7, BGEVENT_READ, PewterGymStatue + bg_event 2, 11, BGEVENT_READ, PewterGymStatue + bg_event 7, 11, BGEVENT_READ, PewterGymStatue .ObjectEvents: db 3 - object_event SPRITE_BROCK, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 - object_event SPRITE_YOUNGSTER, 5, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 - object_event SPRITE_GYM_GUY, 11, 6, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 + object_event 5, 1, SPRITE_BROCK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrockScript_0x1a2864, -1 + object_event 2, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperJerry, -1 + object_event 6, 11, SPRITE_GYM_GUY, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 1, PewterGymGuyScript, -1 |