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/TradeCenter.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/TradeCenter.asm')
| -rw-r--r-- | maps/TradeCenter.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index ebd3d8a3a..fe9e43ce4 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -59,8 +59,8 @@ TradeCenter_MapEventHeader: .Warps: db 2 - warp_def $7, $4, 2, POKECENTER_2F - warp_def $7, $5, 2, POKECENTER_2F + warp_def 4, 7, 2, POKECENTER_2F + warp_def 5, 7, 2, POKECENTER_2F .CoordEvents: db 0 @@ -68,9 +68,9 @@ TradeCenter_MapEventHeader: .BGEvents: db 2 bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script - bg_event 4, 5, BGEVENT_LEFT, MapTradeCenterSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script .ObjectEvents: db 2 - object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT |