Skip to content

Commit

Permalink
Added Silver Cave Cliff Side maps and Tilesets
Browse files Browse the repository at this point in the history
  • Loading branch information
SoupPotato committed Aug 3, 2024
1 parent 985b295 commit 1f12170
Show file tree
Hide file tree
Showing 37 changed files with 478 additions and 77 deletions.
8 changes: 6 additions & 2 deletions constants/event_flags.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,11 @@
const EVENT_RADIO_TOWER_5F_ULTRA_BALL
const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
const EVENT_BATTLE_TOWER_OPEN_CIVILIANS
; Unused: next 48 events
const EVENT_SILVER_CAVE_CLIFF_SIDE_1F_GUARD_SPEC
const EVENT_SILVER_CAVE_CLIFF_SIDE_1F_CARBOS
const EVENT_SILVER_CAVE_CLIFF_SIDE_2F_HYPER_POTION
const EVENT_SILVER_CAVE_CLIFF_SIDE_2F_RARE_CANDY
; Unused: next 44 events

const_next 2048
const_next 2044
DEF NUM_EVENTS EQU const_value ; 800
6 changes: 4 additions & 2 deletions constants/map_constants.asm
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ ENDM
map_const WHIRL_ISLAND_B1F, 20, 18 ; 71
map_const WHIRL_ISLAND_B2F, 10, 18 ; 72
map_const WHIRL_ISLAND_LUGIA_CHAMBER, 10, 9 ; 73
map_const SILVER_CAVE_ROOM_1, 10, 18 ; 74
map_const SILVER_CAVE_ROOM_2, 15, 19 ; 75
map_const SILVER_CAVE_ROOM_1, 10, 23 ; 74
map_const SILVER_CAVE_ROOM_2, 15, 20 ; 75
map_const SILVER_CAVE_ROOM_3, 10, 18 ; 76
map_const SILVER_CAVE_ITEM_ROOMS, 10, 17 ; 77
map_const DARK_CAVE_VIOLET_ENTRANCE, 20, 18 ; 78
Expand Down Expand Up @@ -538,6 +538,8 @@ ENDM

newgroup SAFARI_ZONE ; 28
map_const SAFARI_ZONE_AREA_3, 21, 17 ; 1
map_const SILVER_CAVE_CLIFF_SIDE_1F, 15, 20 ; 2
map_const SILVER_CAVE_CLIFF_SIDE_2F, 17, 18 ; 3
endgroup

DEF NUM_MAP_GROUPS EQU const_value ; 26
1 change: 1 addition & 0 deletions constants/tileset_constants.asm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24
const TILESET_CLIFF_SIDE ; 25
DEF NUM_TILESETS EQU const_value - 1

; wTileset struct size
Expand Down
2 changes: 2 additions & 0 deletions data/maps/attributes.asm
Original file line number Diff line number Diff line change
Expand Up @@ -738,3 +738,5 @@ ENDM
map_attributes SafariRestHouseArea2, SAFARI_REST_HOUSE_AREA_2, $00, 0
map_attributes SafariRestHouseArea3, SAFARI_REST_HOUSE_AREA_3, $00, 0
map_attributes SafariRestHouseArea4, SAFARI_REST_HOUSE_AREA_4, $00, 0
map_attributes SilverCaveCliffSide1F, SILVER_CAVE_CLIFF_SIDE_1F, $48, 0
map_attributes SilverCaveCliffSide2F, SILVER_CAVE_CLIFF_SIDE_2F, $0c, 0
6 changes: 6 additions & 0 deletions data/maps/blocks.asm
Original file line number Diff line number Diff line change
Expand Up @@ -996,4 +996,10 @@ SafariRestHouseArea4_Blocks:

SafariZoneEntrance_Blocks:
INCBIN "maps/SafariZoneEntrance.blk"

SilverCaveCliffSide1F_Blocks:
INCBIN "maps/SilverCaveCliffSide1F.blk"

SilverCaveCliffSide2F_Blocks:
INCBIN "maps/SilverCaveCliffSide2F.blk"
ENDSECTION
4 changes: 3 additions & 1 deletion data/maps/maps.asm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ MapGroup_Dungeons:
map WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, LANDMARK_WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE | IN_DARKNESS, FISHGROUP_WHIRL_ISLANDS
map WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, LANDMARK_WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE | IN_DARKNESS, FISHGROUP_WHIRL_ISLANDS
map WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, LANDMARK_WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE | IN_DARKNESS, FISHGROUP_WHIRL_ISLANDS
map SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE | IN_DARKNESS, FISHGROUP_LAKE
map SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
map SilverCaveRoom2, TILESET_CAVE, CAVE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
map SilverCaveRoom3, TILESET_CAVE, CAVE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE
map SilverCaveItemRooms, TILESET_CAVE, CAVE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE
Expand Down Expand Up @@ -578,4 +578,6 @@ MapGroup_SafariZoneGate:
MapGroup_SafariZone:
table_width MAP_LENGTH, MapGroup_SafariZone
map SafariZoneArea3, TILESET_PARK, ROUTE, LANDMARK_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_POND
map SilverCaveCliffSide1F, TILESET_CLIFF_SIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
map SilverCaveCliffSide2F, TILESET_CLIFF_SIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
assert_table_length NUM_SAFARI_ZONE_MAPS
2 changes: 2 additions & 0 deletions data/maps/scripts.asm
Original file line number Diff line number Diff line change
Expand Up @@ -520,5 +520,7 @@ INCLUDE "maps/SafariRestHouseArea2.asm"
INCLUDE "maps/SafariRestHouseArea3.asm"
INCLUDE "maps/SafariRestHouseArea4.asm"
INCLUDE "maps/Route39.asm"
INCLUDE "maps/SilverCaveCliffSide1F.asm"
INCLUDE "maps/SilverCaveCliffSide2F.asm"

ENDSECTION
1 change: 1 addition & 0 deletions data/tilesets.asm
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,5 @@ Tilesets::
tileset TilesetKabutoWordRoom
tileset TilesetOmanyteWordRoom
tileset TilesetAerodactylWordRoom
tileset TilesetCliffSide
assert_table_length NUM_TILESETS + 1
2 changes: 2 additions & 0 deletions data/tilesets/cave_collision.asm
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,5 @@
tilecoll WALL, FLOOR, WALL, FLOOR ; 5e
tilecoll UP_WALL, UP_WALL, FLOOR, WARP_CARPET_DOWN ; 5f
tilecoll WATER, WATER, WALL, FLOOR ; 60
tilecoll WALL, WALL, WALL, CAVE ; 61
tilecoll WALL, WALL, WALL, WALL ; 62
2 changes: 1 addition & 1 deletion data/tilesets/cave_metatiles.bin
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
&P
PP&  
&
PPPP%&&%&&&%&&&%&&&&&'&&&'&&&'&&&'$$$%&&&$$$&&&'IJYZKL[\IJ YZKL [\%&&&&&&&%&@@%&@@%&@@%&@@@@&'@@&'@@&'@@&'%@@%&@@@@'@@&'%67%&67$$$$ 
PPPP%&&%&&&%&&&%&&&&&'&&&'&&&'&&&'$$$%&&&$$$&&&'IJYZKL[\IJ YZKL [\%&&&&&&&%&@@%&@@%&@@%&@@@@&'@@&'@@&'@@&'%@@%&@@@@'@@&'%67%&67$$$$ &&&&&&&&&&��&&��&&&&&&&&&&&&&&&&
Expand Down
130 changes: 130 additions & 0 deletions data/tilesets/cliff_side_collision.asm
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
tilecoll WALL, WALL, WALL, WALL ; 07
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, CAVE ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, UP_WALL, WALL, FLOOR ; 0e
tilecoll UP_WALL, WALL, FLOOR, WALL ; 0f
tilecoll WALL, FLOOR, WALL, FLOOR ; 10
tilecoll FLOOR, WALL, FLOOR, WALL ; 11
tilecoll WALL, FLOOR, WALL, WALL ; 12
tilecoll FLOOR, WALL, WALL, WALL ; 13
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 14
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 15
tilecoll WALL, UP_WALL, WALL, FLOOR ; 16
tilecoll UP_WALL, WALL, FLOOR, WALL ; 17
tilecoll WALL, FLOOR, WALL, FLOOR ; 18
tilecoll FLOOR, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, WALL ; 1a
tilecoll FLOOR, WALL, WALL, WALL ; 1b
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, UP_WALL, WALL, FLOOR ; 1e
tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f
tilecoll WALL, FLOOR, WALL, FLOOR ; 20
tilecoll FLOOR, WALL, FLOOR, WALL ; 21
tilecoll WALL, FLOOR, WALL, WALL ; 22
tilecoll FLOOR, WALL, WALL, WALL ; 23
tilecoll WALL, WALL, WALL, WALL ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll FLOOR, FLOOR, WALL, WALL ; 27
tilecoll WALL, FLOOR, WALL, FLOOR ; 28
tilecoll WALL, FLOOR, WALL, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b
tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
tilecoll WALL, FLOOR, WALL, FLOOR ; 2d
tilecoll WALL, WALL, FLOOR, FLOOR ; 2e
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f
tilecoll FLOOR, FLOOR, WALL, WALL ; 30
tilecoll UP_WALL, UP_WALL, WALL, FLOOR ; 31
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 32
tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 33
tilecoll WALL, UP_WALL, FLOOR, FLOOR ; 34
tilecoll UP_WALL, UP_WALL, TALL_GRASS, TALL_GRASS ; 35
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 36
tilecoll UP_WALL, WALL, TALL_GRASS, WALL ; 37
tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 38
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 39
tilecoll FLOOR, FLOOR, WALL, WALL ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, CAVE, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e
tilecoll FLOOR, FLOOR, TALL_GRASS, TALL_GRASS ; 3f
tilecoll TALL_GRASS, TALL_GRASS, FLOOR, FLOOR ; 40
tilecoll TALL_GRASS, TALL_GRASS, WALL, WALL ; 41
tilecoll UP_WALL, UP_WALL, FLOOR, WALL ; 42
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 43
tilecoll WALL, WALL, WALL, WALL ; 44
tilecoll WALL, WALL, WALL, WALL ; 45
tilecoll WALL, WALL, TALL_GRASS, TALL_GRASS ; 46
tilecoll FLOOR, HOP_RIGHT, FLOOR, WALL ; 47
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 49
tilecoll WALL, FLOOR, WALL, FLOOR ; 4a
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4b
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4c
tilecoll WALL, WALL, WALL, WALL ; 4d
tilecoll WALL, WALL, WALL, WALL ; 4e
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4f
tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 50
tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 51
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 52
tilecoll WALL, WALL, WALL, WALL ; 53
tilecoll WALL, WALL, FLOOR, FLOOR ; 54
tilecoll WALL, FLOOR, WALL, FLOOR ; 55
tilecoll FLOOR, WALL, FLOOR, WALL ; 56
tilecoll WALL, WALL, WALL, WALL ; 57
tilecoll WALL, WALL, WALL, WALL ; 58
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 59
tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 5a
tilecoll WALL, UP_WALL, FLOOR, WARP_CARPET_DOWN ; 5b
tilecoll WALL, WALL, WALL, CAVE ; 5c
tilecoll WALL, WALL, WALL, WALL ; 5d
tilecoll WALL, WALL, WALL, WALL ; 5e
tilecoll WALL, WALL, WALL, WALL ; 5f
tilecoll FLOOR, WALL, FLOOR, WALL ; 60
tilecoll FLOOR, WALL, FLOOR, WALL ; 61
tilecoll WALL, WALL, WALL, FLOOR ; 62
tilecoll WALL, FLOOR, WALL, FLOOR ; 63
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 64
tilecoll WALL, UP_WALL, WALL, FLOOR ; 65
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 66
tilecoll WALL, WALL, WALL, WALL ; 67
tilecoll FLOOR, UP_WALL, FLOOR, FLOOR ; 68
tilecoll WALL, WALL, WALL, CAVE ; 69
tilecoll FLOOR, WALL, TALL_GRASS, TALL_GRASS ; 6a
tilecoll WALL, WALL, WALL, WALL ; 6b
tilecoll WALL, FLOOR, WALL, FLOOR ; 6c
tilecoll WALL, WALL, WALL, WALL ; 6d
tilecoll WALL, FLOOR, WALL, FLOOR ; 6e
tilecoll WALL, FLOOR, WALL, FLOOR ; 6f
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 70
tilecoll WALL, WALL, FLOOR, FLOOR ; 71
tilecoll WALL, HOP_RIGHT, WALL, HOP_RIGHT ; 72
tilecoll WALL, FLOOR, WALL, FLOOR ; 73
tilecoll WALL, FLOOR, WALL, FLOOR ; 74
tilecoll WALL, FLOOR, WALL, FLOOR ; 75
tilecoll FLOOR, WALL, FLOOR, WALL ; 76
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 77
tilecoll FLOOR, WALL, FLOOR, WALL ; 78
tilecoll FLOOR, WALL, FLOOR, WALL ; 79
tilecoll WALL, WALL, WALL, WALL ; 7a
tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 7c
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 7d
tilecoll WALL, WALL, WALL, FLOOR ; 7e
tilecoll FLOOR, WALL, WALL, WALL ; 7f
tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 80
tilecoll TALL_GRASS, FLOOR, TALL_GRASS, FLOOR ; 81
Binary file added data/tilesets/cliff_side_metatiles.bin
Binary file not shown.
1 change: 1 addition & 0 deletions data/tilesets/dark_cave_collision.asm
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,4 @@
tilecoll WALL, WALL, WALL, WALL ; 7e
tilecoll WATER, WATER, WALL, WALL ; 7f
tilecoll WALL, HOP_DOWN, WALL, WALL ; 80
tilecoll FLOOR, FLOOR, WALL, CAVE ; 81
2 changes: 1 addition & 1 deletion data/tilesets/dark_cave_metatiles.bin
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
&
67'67&'&  %67%&67&  
&
@@@@%&&'%&&'%&&'@@@@@@@@%&&'%&&'@@@@@@@@@@@@%&&'AAAAAAAA  &&
@@@@%&&'%&&'%&&'@@@@@@@@%&&'%&&'@@@@@@@@@@@@%&&'AAAAAAAA  &&&&NO&&^_
Expand Down
56 changes: 56 additions & 0 deletions data/wild/challenge_mode/johto_grass.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1878,4 +1878,60 @@ JohtoGrassWildMonsChallenge:
db 55, SNEASEL
end_grass_wildmons

def_grass_wildmons SILVER_CAVE_CLIFF_SIDE_1F
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 56, GOLBAT
db 57, GOLDUCK
db 57, DONPHAN
db 57, URSARING
db 57, PARASECT
db 40, LARVITAR
db 45, LARVITAR
; day
db 56, GOLBAT
db 57, GOLDUCK
db 57, DONPHAN
db 57, URSARING
db 57, PARASECT
db 40, LARVITAR
db 45, LARVITAR
; nite
db 56, GOLBAT
db 57, GOLDUCK
db 57, DONPHAN
db 57, URSARING
db 57, PARASECT
db 40, LARVITAR
db 45, LARVITAR
end_grass_wildmons

def_grass_wildmons SILVER_CAVE_CLIFF_SIDE_2F
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 58, GOLBAT
db 58, GOLDUCK
db 57, SNEASEL
db 57, URSARING
db 58, DONPHAN
db 40, LARVITAR
db 45, LARVITAR
; day
db 58, GOLBAT
db 58, GOLDUCK
db 57, SNEASEL
db 57, URSARING
db 58, DONPHAN
db 40, LARVITAR
db 45, LARVITAR
; nite
db 58, GOLBAT
db 58, MISDREAVUS
db 57, SNEASEL
db 57, PARASECT
db 58, GOLDUCK
db 40, LARVITAR
db 45, LARVITAR
end_grass_wildmons

db -1 ; end
56 changes: 56 additions & 0 deletions data/wild/johto_grass.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1878,4 +1878,60 @@ JohtoGrassWildMons:
db 52, SNEASEL
end_grass_wildmons

def_grass_wildmons SILVER_CAVE_CLIFF_SIDE_1F
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 53, GOLBAT
db 54, GOLDUCK
db 54, DONPHAN
db 54, URSARING
db 55, PARASECT
db 40, LARVITAR
db 45, LARVITAR
; day
db 53, GOLBAT
db 54, GOLDUCK
db 54, DONPHAN
db 54, URSARING
db 55, PARASECT
db 40, LARVITAR
db 45, LARVITAR
; nite
db 53, GOLBAT
db 54, GOLDUCK
db 54, DONPHAN
db 54, URSARING
db 55, PARASECT
db 40, LARVITAR
db 45, LARVITAR
end_grass_wildmons

def_grass_wildmons SILVER_CAVE_CLIFF_SIDE_2F
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
db 55, GOLBAT
db 55, GOLDUCK
db 54, SNEASEL
db 54, URSARING
db 55, DONPHAN
db 40, LARVITAR
db 45, LARVITAR
; day
db 55, GOLBAT
db 55, GOLDUCK
db 54, SNEASEL
db 54, URSARING
db 55, DONPHAN
db 40, LARVITAR
db 45, LARVITAR
; nite
db 55, GOLBAT
db 55, MISDREAVUS
db 54, SNEASEL
db 54, PARASECT
db 55, GOLDUCK
db 40, LARVITAR
db 45, LARVITAR
end_grass_wildmons

db -1 ; end
1 change: 1 addition & 0 deletions engine/tilesets/tileset_anims.asm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ _AnimateTileset::
Tileset0Anim:
TilesetJohtoModernAnim:
TilesetKantoAnim:
TilesetCliffSideAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw vTiles2 tile $64, AnimateFountainTile
Expand Down
8 changes: 8 additions & 0 deletions engine/tilesets/tileset_palettes.asm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ MapSpecificPalettes:
_use_palette_routine_for_map KOGAS_ROOM, .KogasRoomBGPalettes
_use_palette_routine_for_map WILLS_ROOM, .WillsRoomBGPalettes
_use_palette_routine_for_map VIRIDIAN_GYM, .ViridianGymBGPalettes
_use_palette_routine_for_map SILVER_CAVE_CLIFF_SIDE_2F, .CliffSideBGPalettes
db -1 ; terminator

.LavaOverRedCoalOverBrownBGPalette:
Expand All @@ -136,6 +137,13 @@ MapSpecificPalettes:
ld bc, 8 palettes
call AddNTimes
jp .next_TimeOfDay
.CliffSideBGPalettes:
ld hl, CliffSidePals
ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES
ld bc, 8 palettes
call AddNTimes
jp .next_TimeOfDay
.SundriedBGPalettes:
ld hl, SundriedPals
ld a, [wTimeOfDayPal]
Expand Down
Loading

0 comments on commit 1f12170

Please sign in to comment.