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/BrunosRoom.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/BrunosRoom.asm')
| -rw-r--r-- | maps/BrunosRoom.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 8ac5547de..784f06185 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -130,10 +130,10 @@ BrunosRoom_MapEventHeader: .Warps: db 4 - warp_def $11, $4, 3, KOGAS_ROOM - warp_def $11, $5, 4, KOGAS_ROOM - warp_def $2, $4, 1, KARENS_ROOM - warp_def $2, $5, 2, KARENS_ROOM + warp_def 4, 17, 3, KOGAS_ROOM + warp_def 5, 17, 4, KOGAS_ROOM + warp_def 4, 2, 1, KARENS_ROOM + warp_def 5, 2, 2, KARENS_ROOM .CoordEvents: db 0 @@ -143,4 +143,4 @@ BrunosRoom_MapEventHeader: .ObjectEvents: db 1 - object_event SPRITE_BRUNO, 7, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 + object_event 5, 7, SPRITE_BRUNO, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BrunoScript_Battle, -1 |