thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modularize the beach house.

Browse source
This commit is contained in:
IIMarckus 2014-10-17 12:16:52 -06:00
parent 16ad16302e
commit 1d579928dc
12 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/collision.asm
View file

@ -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

8
data/mapObjects/route19.asm
View file

@ -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

3
data/map_header_banks.asm
View file

@ -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

3
data/map_header_pointers.asm
View file

@ -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

3
data/map_songs.asm
View file

@ -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

2
data/tileset_headers.asm
View file

@ -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