diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-06 13:51:06 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 17:32:39 -0400 |
| commit | 8f2edd9c413d09c4ec74abab7e2af0a2fcc5d951 (patch) | |
| tree | 08106f9eec9cff1137269c20ccf848cfeffa71c6 /constants | |
| parent | 10af88ddd712415f2a0a2b6124187d51075c95d5 (diff) | |
Build only Yellow
Conflicts:
gfx/intro_nido_1.6x6.png
gfx/intro_nido_2.6x6.png
gfx/intro_nido_3.6x6.png
gfx/redgreenversion.png
text.asm
text/maps/cerulean_trade_house.asm
text/maps/copycats_house_1f.asm
text/maps/daycare_2.asm
text/maps/museum_2f.asm
text/maps/oaks_lab.asm
text/maps/pewter_gym.asm
text/maps/route_9_1.asm
text/maps/school.asm
text/maps/vermilion_gym_1.asm
yellow/main.asm
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/map_dimensions.asm | 2 | ||||
| -rwxr-xr-x | constants/sprite_constants.asm | 3 | ||||
| -rw-r--r-- | constants/tilesets.asm | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 11deedd0..4e764433 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -246,6 +246,4 @@ TRADE_CENTER EQU $F0 LORELEIS_ROOM EQU $F5 BRUNOS_ROOM EQU $F6 AGATHAS_ROOM EQU $F7 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE EQU $F8 -ENDC diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm index 236ccac4..cd7980ef 100755 --- a/constants/map_dimensions.asm +++ b/constants/map_dimensions.asm @@ -892,7 +892,5 @@ BRUNOS_ROOM_WIDTH EQU $05 AGATHAS_ROOM_HEIGHT EQU $06 AGATHAS_ROOM_WIDTH EQU $05 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE_HEIGHT EQU 4 BEACH_HOUSE_WIDTH EQU 7 -ENDC diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index dc249d59..b5290d29 100755 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -84,6 +84,9 @@ SPRITE_LYING_OLD_MAN_UNUSED_1 EQU $46 SPRITE_LYING_OLD_MAN_UNUSED_2 EQU $47 SPRITE_LYING_OLD_MAN EQU $48 +SPRITE_JESSIE EQU $45 +SPRITE_JAMES EQU $46 + ; different kinds of people events ITEM EQU $80 TRAINER EQU $40 diff --git a/constants/tilesets.asm b/constants/tilesets.asm index bf15f24e..5d6698f5 100644 --- a/constants/tilesets.asm +++ b/constants/tilesets.asm @@ -22,6 +22,4 @@ LAB EQU 20 CLUB EQU 21 FACILITY EQU 22 PLATEAU EQU 23 -IF DEF(_OPTION_BEACH_HOUSE) BEACH_HOUSE_TILESET EQU 24 -ENDC |