diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-10-17 12:16:52 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-10-17 12:16:52 -0600 |
| commit | 1d579928dc0a3ecbaa169ae76a7abcc310e2c7ce (patch) | |
| tree | 3320eb30ddf4e52c751a63f06e36868d33ef9544 /data | |
| parent | 16ad16302e0c5ee116c697454cb98a62cf0bb58b (diff) | |
Modularize the beach house.
Diffstat (limited to 'data')
| -rw-r--r-- | data/collision.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/route19.asm | 8 | ||||
| -rwxr-xr-x | data/map_header_banks.asm | 3 | ||||
| -rwxr-xr-x | data/map_header_pointers.asm | 3 | ||||
| -rwxr-xr-x | data/map_songs.asm | 3 | ||||
| -rwxr-xr-x | data/tileset_headers.asm | 2 |
6 files changed, 15 insertions, 6 deletions
diff --git a/data/collision.asm b/data/collision.asm index d3659e2a..46d5ddc6 100644 --- a/data/collision.asm +++ b/data/collision.asm @@ -22,6 +22,6 @@ Lab_Coll:: INCBIN "gfx/tilesets/lab.tilecoll" Club_Coll:: INCBIN "gfx/tilesets/club.tilecoll" Facility_Coll:: INCBIN "gfx/tilesets/facility.tilecoll" Plateau_Coll:: INCBIN "gfx/tilesets/plateau.tilecoll" -IF DEF(_YELLOW) +IF DEF(_OPTION_BEACH_HOUSE) BeachHouse_Coll:: INCBIN "gfx/tilesets/beachhouse.tilecoll" ENDC diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index c225ed29..7d3a342c 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,7 +1,7 @@ Route19Object: ; 0x54e9a (size=87) db $43 ; border block - IF DEF(_YELLOW) + IF DEF(_OPTION_BEACH_HOUSE) db $1 ; warps db $9, $5, $0, BEACH_HOUSE ELSE @@ -9,14 +9,14 @@ Route19Object: ; 0x54e9a (size=87) ENDC db $1 ; signs -IF DEF(_YELLOW) +IF DEF(_OPTION_BEACH_HOUSE) db $b,$b,$b ELSE db $9, $b, $b ; Route19Text11 ENDC db $a ; people -IF DEF(_YELLOW) +IF DEF(_OPTION_BEACH_HOUSE) 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 @@ -33,6 +33,6 @@ ENDC db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e ; warp-to - IF DEF(_YELLOW) + IF DEF(_OPTION_BEACH_HOUSE) EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE ENDC diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index abc413c7..f6bd8d99 100755 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -248,3 +248,6 @@ MapHeaderBanks: ; c23d (3:423d) db BANK(Lorelei_h) db BANK(Bruno_h) db BANK(Agatha_h) +IF DEF(_OPTION_BEACH_HOUSE) + db BANK(BeachHouse_h) +ENDC diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 4f3248fc..771989a5 100755 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -248,3 +248,6 @@ MapHeaderPointers:: ; 01ae (0:01ae) dw Lorelei_h dw Bruno_h dw Agatha_h ;247 +IF DEF(_OPTION_BEACH_HOUSE) + dw BeachHouse_h +ENDC diff --git a/data/map_songs.asm b/data/map_songs.asm index c551a76d..1d7ab269 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -247,3 +247,6 @@ MapSongBanks: ; c04d (3:404d) db MUSIC_GYM, BANK(Music_Gym) ; Lorelei db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha +IF DEF(_OPTION_BEACH_HOUSE) + db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse +ENDC diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 6631b8f0..3e2e68bb 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -23,6 +23,6 @@ Tilesets: ; c7be (3:47be) tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE -IF DEF(_YELLOW) +IF DEF(_OPTION_BEACH_HOUSE) tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR ENDC |