diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-17 09:01:48 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-17 09:01:48 -0600 |
| commit | 60bc4b9b9b9ed7c03e549a39d4f29998e951b01f (patch) | |
| tree | 7cadfe084a80c03da5b5a0f9d92defa65c5ff194 | |
| parent | 7db2fe99f83e196a92bd3dab2e4c6b8c7b191682 (diff) | |
Fix Route 19 for Yellow.
| -rwxr-xr-x | data/mapObjects/route19.asm | 17 | ||||
| -rwxr-xr-x | main.asm | 4 | ||||
| -rw-r--r-- | maps/route19-yellow.blk | 1 |
3 files changed, 18 insertions, 4 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 8ce41558..935e11ed 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -3,17 +3,26 @@ Route19Object: ; 0x54e9a (size=87) IF DEF(_YELLOW) db $1 ; warps - db $9, $5, $0, $f8 ; SURF_HOUSE + db $9, $5, $0, $f8 ; BEACH_HOUSE ELSE db $0 ; warps ENDC db $1 ; signs +IF DEF(_YELLOW) + db $b,$b,$b +ELSE db $9, $b, $b ; Route19Text11 +ENDC db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | $1, SWIMMER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | $2, SWIMMER + $C8, $3 +IF DEF(_YELLOW) + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2 + db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 +ELSE + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2 + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 +ENDC db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4 db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5 db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6 @@ -25,5 +34,5 @@ Route19Object: ; 0x54e9a (size=87) ; warp-to IF DEF(_YELLOW) - EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; SURF_HOUSE + EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE ENDC @@ -5965,7 +5965,11 @@ Route17Blocks: INCBIN "maps/route17.blk" INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" +IF DEF(_YELLOW) +Route19Blocks: INCBIN "maps/route19-yellow.blk" +ELSE Route19Blocks: INCBIN "maps/route19.blk" +ENDC INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk new file mode 100644 index 00000000..3fc58494 --- /dev/null +++ b/maps/route19-yellow.blk @@ -0,0 +1 @@ +(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk
\ No newline at end of file |