ref: 1d579928dc0a3ecbaa169ae76a7abcc310e2c7ce
parent: 16ad16302e0c5ee116c697454cb98a62cf0bb58b
author: IIMarckus <iimarckus@gmail.com>
date: Fri Oct 17 08:16:52 EDT 2014
Modularize the beach house.
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -246,6 +246,6 @@
LORELEIS_ROOM EQU $F5
BRUNOS_ROOM EQU $F6
AGATHAS_ROOM EQU $F7
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
BEACH_HOUSE EQU $F8
ENDC
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -892,7 +892,7 @@
AGATHAS_ROOM_HEIGHT EQU $06
AGATHAS_ROOM_WIDTH EQU $05
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
BEACH_HOUSE_HEIGHT EQU 4
BEACH_HOUSE_WIDTH EQU 7
ENDC
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -22,6 +22,6 @@
CLUB EQU 21
FACILITY EQU 22
PLATEAU EQU 23
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
BEACH_HOUSE_TILESET EQU 24
ENDC
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,6 +22,6 @@
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
--- 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,7 +9,7 @@
ENDC
db $1 ; signs
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
db $b,$b,$b
ELSE
db $9, $b, $b ; Route19Text11
@@ -16,7 +16,7 @@
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 @@
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
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -248,3 +248,6 @@
db BANK(Lorelei_h)
db BANK(Bruno_h)
db BANK(Agatha_h)
+IF DEF(_OPTION_BEACH_HOUSE)
+ db BANK(BeachHouse_h)
+ENDC
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -248,3 +248,6 @@
dw Lorelei_h
dw Bruno_h
dw Agatha_h ;247
+IF DEF(_OPTION_BEACH_HOUSE)
+ dw BeachHouse_h
+ENDC
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -247,3 +247,6 @@
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
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,6 +23,6 @@
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
--- a/main.asm
+++ b/main.asm
@@ -5715,8 +5715,11 @@
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
+INCLUDE "data/mapHeaders/beach_house.asm"
INCLUDE "scripts/beach_house.asm"
+BeachHouseBlockdata: INCBIN "maps/beach_house.blk"
+INCLUDE "data/mapObjects/beach_house.asm"
ENDC
INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
@@ -5965,7 +5968,7 @@
INCLUDE "data/mapHeaders/route19.asm"
INCLUDE "data/mapObjects/route19.asm"
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
Route19Blocks: INCBIN "maps/route19-yellow.blk"
ELSE
Route19Blocks: INCBIN "maps/route19.blk"
@@ -6636,8 +6639,8 @@
INCLUDE "engine/items/tm_prices.asm"
-IF DEF(_YELLOW)
-SECTION "bank3C",ROMX[$314],BANK[$3C]
+IF DEF(_OPTION_BEACH_HOUSE)
+SECTION "bank3C",ROMX[$4314],BANK[$3C]
BeachHouse_GFX:
INCBIN "gfx/tilesets/beachhouse.2bpp"
--- a/text.asm
+++ b/text.asm
@@ -2135,7 +2135,7 @@
INCLUDE "text/maps/route_16_house.asm"
INCLUDE "text/maps/route_18_gate.asm"
INCLUDE "text/maps/route_18_gate_upstairs.asm"
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
INCLUDE "text/maps/beach_house.asm"
ENDC
INCLUDE "text/maps/pokemon_league_gate.asm"
--- a/yellow.asm
+++ b/yellow.asm
@@ -1,1 +1,2 @@
_YELLOW EQU 1
+_OPTION_BEACH_HOUSE EQU 1