diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 18:33:42 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 18:33:42 -0400 |
commit | 7caa8c4be0a77083a445a1b1d2ace4031f5cb4f0 (patch) | |
tree | 5170efbe8e1c0ccbbb29f91ba58a79812801e93f /data | |
parent | d9e7b91cb3a77891901974f65104dca2fc286ab7 (diff) |
Route 19
Diffstat (limited to 'data')
-rwxr-xr-x | data/mapObjects/route19.asm | 17 | ||||
-rw-r--r-- | data/map_header_banks.asm | 2 | ||||
-rw-r--r-- | data/map_header_pointers.asm | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 7377e1e6..ec2b8774 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -9,13 +9,16 @@ Route19Object: ; 0x54e9a (size=87) db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e + object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3 + object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $04, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 + object SPRITE_SWIMMER, $09, $0d, STAY, DOWN, $6, OPP_SWIMMER, $7 + object SPRITE_SWIMMER, $08, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $0b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $09, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $0a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index a9de3dff..22b939d6 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -30,7 +30,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route16_h) ; ROUTE_16 db $15 ; db BANK(Route17_h) ; ROUTE_17 db $16 ; db BANK(Route18_h) ; ROUTE_18 - db $15 ; db BANK(Route19_h) ; ROUTE_19 + db BANK(Route19_h) ; ROUTE_19 db BANK(Route20_h) ; ROUTE_20 db BANK(Route21_h) ; ROUTE_21 db BANK(Route22_h) ; ROUTE_22 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d6672bbe..7ac1d910 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -30,7 +30,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4ada ; dw Route16_h dw $4b28 ; dw Route17_h dw $4c38 ; dw Route18_h - dw $4e80 ; dw Route19_h + dw Route19_h dw Route20_h dw Route21_h dw Route22_h |