diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /data/mapObjects/seafoamislands2.asm | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| parent | Commented/labelled misc functions (diff) | |
| download | pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.gz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.xz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.zip | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'data/mapObjects/seafoamislands2.asm')
| -rwxr-xr-x | data/mapObjects/seafoamislands2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm index 56251d1c..821a38cd 100755 --- a/data/mapObjects/seafoamislands2.asm +++ b/data/mapObjects/seafoamislands2.asm @@ -13,8 +13,8 @@ SeafoamIslands2Object: ; 0x46376 (size=72) db $0 ; signs db $2 ; people - db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, $10, $1 ; person - db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, $10, $2 ; person + db SPRITE_BOULDER, $6 + 4, $11 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $1 ; person + db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, BOULDER_MOVEMENT_BYTE_2, $2 ; person ; warp-to EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3 |