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/WillsRoom.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/WillsRoom.asm')
| -rw-r--r-- | maps/WillsRoom.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 55b132356..d72451638 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -134,9 +134,9 @@ WillsRoom_MapEventHeader: .Warps: db 3 - warp_def $11, $5, 4, INDIGO_PLATEAU_POKECENTER_1F - warp_def $2, $4, 1, KOGAS_ROOM - warp_def $2, $5, 2, KOGAS_ROOM + warp_def 5, 17, 4, INDIGO_PLATEAU_POKECENTER_1F + warp_def 4, 2, 1, KOGAS_ROOM + warp_def 5, 2, 2, KOGAS_ROOM .CoordEvents: db 0 @@ -146,4 +146,4 @@ WillsRoom_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_WILL, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 + object_event 5, 7, SPRITE_WILL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WillScript_Battle, -1 |