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/FuchsiaMart.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/FuchsiaMart.asm')
| -rw-r--r-- | maps/FuchsiaMart.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 05266ecee..48ffdba5f 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -43,8 +43,8 @@ FuchsiaMart_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 1, FUCHSIA_CITY - warp_def $7, $3, 1, FUCHSIA_CITY + warp_def 2, 7, 1, FUCHSIA_CITY + warp_def 3, 7, 1, FUCHSIA_CITY .CoordEvents: db 0 @@ -54,6 +54,6 @@ FuchsiaMart_MapEventHeader: .ObjectEvents: db 3 - object_event SPRITE_CLERK, 3, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 - object_event SPRITE_FISHER, 2, 3, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 - object_event SPRITE_COOLTRAINER_F, 6, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 + object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x195ce8, -1 + object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, FuchsiaMartFisherScript, -1 + object_event 7, 6, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaMartCooltrainerFScript, -1 |