pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Create a fourth time of day (#2)

Browse Source
This commit is contained in:
xCrystal 2023-07-31 12:27:53 +02:00
parent 05448d7a7e
commit 9df4cf6946
30 changed files with 270 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
constants/map_data_constants.asm
View File

@ -35,9 +35,12 @@ DEF NUM_ENVIRONMENTS EQU const_value - 1
const PALETTE_DAY const PALETTE_DAY
const PALETTE_NITE const PALETTE_NITE
const PALETTE_MORN const PALETTE_MORN
const PALETTE_DARK const PALETTE_EVE
DEF NUM_MAP_PALETTES EQU const_value DEF NUM_MAP_PALETTES EQU const_value
IN_DARKNESS_F EQU 3
IN_DARKNESS EQU 1 << IN_DARKNESS_F ; masked with a PALETTE_* constant
; FishGroups indexes (see data/wild/fish.asm) ; FishGroups indexes (see data/wild/fish.asm)
const_def const_def
const FISHGROUP_NONE const FISHGROUP_NONE

4
constants/pokemon_data_constants.asm
View File

@ -159,7 +159,7 @@ DEF NUM_HOF_TEAMS EQU 30
const_def 1 const_def 1
const TR_ANYTIME const TR_ANYTIME
const TR_MORNDAY const TR_MORNDAY
const TR_NITE const TR_EVENITE
; EVOLVE_STAT triggers ; EVOLVE_STAT triggers
const_def 1 const_def 1
@ -172,7 +172,7 @@ DEF NUM_HOF_TEAMS EQU 30
DEF NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size DEF NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
DEF NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size DEF NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
DEF GRASS_WILDDATA_LENGTH EQU 2 + 3 + NUM_GRASSMON * 2 * 3 DEF GRASS_WILDDATA_LENGTH EQU 2 + NUM_DAYTIMES + NUM_GRASSMON * 2 * NUM_DAYTIMES
DEF WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 2 DEF WATER_WILDDATA_LENGTH EQU 2 + 1 + NUM_WATERMON * 2
DEF FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3 DEF FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3

9
constants/wram_constants.asm
View File

@ -118,18 +118,19 @@ DEF INIT_MON_LIST EQU 5
const MORN_F ; 0 const MORN_F ; 0
const DAY_F ; 1 const DAY_F ; 1
const NITE_F ; 2 const NITE_F ; 2
const DARKNESS_F ; 3 const EVE_F ; 3
DEF NUM_DAYTIMES EQU const_value DEF NUM_DAYTIMES EQU const_value
DEF MORN EQU 1 << MORN_F DEF MORN EQU 1 << MORN_F
DEF DAY EQU 1 << DAY_F DEF DAY EQU 1 << DAY_F
DEF NITE EQU 1 << NITE_F DEF NITE EQU 1 << NITE_F
DEF DARKNESS EQU 1 << DARKNESS_F DEF EVE EQU 1 << EVE_F
DEF ANYTIME EQU MORN | DAY | NITE DEF ANYTIME EQU MORN | DAY | NITE | EVE
; wTimeOfDayPalset:: ; wTimeOfDayPalset::
DEF DARKNESS_PALSET EQU (DARKNESS_F << 6) | (DARKNESS_F << 4) | (DARKNESS_F << 2) | DARKNESS_F ; Must be different from any in ReplaceTimeOfDayPals.BrightnessLevels
DEF DARKNESS_PALSET EQU $80
; wBattleAnimFlags:: ; wBattleAnimFlags::
const_def const_def

14
data/maps/environment_colors.asm
View File

@ -11,27 +11,27 @@ EnvironmentColorsPointers:
dw .DungeonColors ; DUNGEON dw .DungeonColors ; DUNGEON
assert_table_length NUM_ENVIRONMENTS + 1 assert_table_length NUM_ENVIRONMENTS + 1
; Valid indices: $00 - $29 (see gfx/tilesets/bg_tiles.pal) ; Valid indices: $00 - $2b (see gfx/tilesets/bg_tiles.pal)
.OutdoorColors: .OutdoorColors:
db $00, $01, $02, $28, $04, $05, $06, $07 ; morn db $00, $01, $02, $28, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day db $08, $09, $0a, $29, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $29, $14, $15, $16, $17 ; nite db $10, $11, $12, $2a, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark db $18, $19, $1a, $2b, $1c, $1d, $1e, $1f ; eve
.IndoorColors: .IndoorColors:
db $20, $21, $22, $23, $24, $25, $26, $07 ; morn db $20, $21, $22, $23, $24, $25, $26, $07 ; morn
db $20, $21, $22, $23, $24, $25, $26, $07 ; day db $20, $21, $22, $23, $24, $25, $26, $07 ; day
db $10, $11, $12, $13, $14, $15, $16, $07 ; nite db $10, $11, $12, $13, $14, $15, $16, $07 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; dark db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; eve
.DungeonColors: .DungeonColors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite db $10, $11, $12, $13, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; eve
.Env5Colors: .Env5Colors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite db $10, $11, $12, $13, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; eve

2
data/pokemon/evos_attacks.asm
View File

@ -1796,7 +1796,7 @@ EeveeEvosAttacks:
db EVOLVE_ITEM, WATER_STONE, VAPOREON db EVOLVE_ITEM, WATER_STONE, VAPOREON
db EVOLVE_ITEM, FIRE_STONE, FLAREON db EVOLVE_ITEM, FIRE_STONE, FLAREON
db EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON db EVOLVE_HAPPINESS, TR_MORNDAY, ESPEON
db EVOLVE_HAPPINESS, TR_NITE, UMBREON db EVOLVE_HAPPINESS, TR_EVENITE, UMBREON
db 0 ; no more evolutions db 0 ; no more evolutions
db 1, TACKLE db 1, TACKLE
db 1, TAIL_WHIP db 1, TAIL_WHIP

6
data/text/std_text.asm
View File

@ -10,6 +10,12 @@ NurseDayText:
cont "#MON CENTER." cont "#MON CENTER."
done done
NurseEveText:
text "Good evening!"
line "Welcome to our"
cont "#MON CENTER."
done
NurseNiteText: NurseNiteText:
text "Good evening!" text "Good evening!"
line "You're out late." line "You're out late."

2
data/wild/fish.asm
View File

@ -208,7 +208,7 @@ FishGroups:
db 100 percent, REMORAID, 40 db 100 percent, REMORAID, 40
TimeFishGroups: TimeFishGroups:
; day nite ; morn/day eve/nite
db CORSOLA, 20, STARYU, 20 ; 0 db CORSOLA, 20, STARYU, 20 ; 0
db CORSOLA, 40, STARYU, 40 ; 1 db CORSOLA, 40, STARYU, 40 ; 1
db SHELLDER, 20, SHELLDER, 20 ; 2 db SHELLDER, 20, SHELLDER, 20 ; 2

10
data/wild/johto_grass.asm
View File

@ -3,7 +3,7 @@
JohtoGrassWildMons: JohtoGrassWildMons:
def_grass_wildmons N_A def_grass_wildmons N_A
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite/eve
; morn ; morn
db 3, RATTATA db 3, RATTATA
db 4, RATTATA db 4, RATTATA
@ -28,6 +28,14 @@ JohtoGrassWildMons:
db 6, GASTLY db 6, GASTLY
db 5, RATTATA db 5, RATTATA
db 5, RATTATA db 5, RATTATA
; eve
db 3, RATTATA
db 4, GASTLY
db 5, RATTATA
db 3, RATTATA
db 6, GASTLY
db 5, RATTATA
db 5, RATTATA
end_grass_wildmons end_grass_wildmons
db -1 ; end db -1 ; end

10
data/wild/kanto_grass.asm
View File

@ -3,7 +3,7 @@
KantoGrassWildMons: KantoGrassWildMons:
def_grass_wildmons N_A def_grass_wildmons N_A
db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite db 4 percent, 2 percent, 8 percent, 4 percent ; encounter rates: morn/day/nite/eve
; morn ; morn
db 3, DIGLETT db 3, DIGLETT
db 6, DIGLETT db 6, DIGLETT
@ -28,6 +28,14 @@ KantoGrassWildMons:
db 32, DUGTRIO db 32, DUGTRIO
db 32, DUGTRIO db 32, DUGTRIO
db 32, DUGTRIO db 32, DUGTRIO
; eve
db 3, DIGLETT
db 6, DIGLETT
db 12, DIGLETT
db 24, DIGLETT
db 24, DUGTRIO
db 24, DUGTRIO
db 24, DUGTRIO
end_grass_wildmons end_grass_wildmons
db -1 ; end db -1 ; end

10
data/wild/swarm_grass.asm
View File

@ -4,7 +4,7 @@ SwarmGrassWildMons:
; Dunsparce swarm ; Dunsparce swarm
map_id N_A map_id N_A
db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite db 4 percent, 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite/eve
; morn ; morn
db 3, GEODUDE db 3, GEODUDE
db 3, DUNSPARCE db 3, DUNSPARCE
@ -29,5 +29,13 @@ SwarmGrassWildMons:
db 2, DUNSPARCE db 2, DUNSPARCE
db 4, DUNSPARCE db 4, DUNSPARCE
db 4, DUNSPARCE db 4, DUNSPARCE
; eve
db 3, GEODUDE
db 3, DUNSPARCE
db 2, ZUBAT
db 2, GEODUDE
db 2, DUNSPARCE
db 4, DUNSPARCE
db 4, DUNSPARCE
db -1 ; end db -1 ; end

5
engine/battle/battle_transition.asm
View File

@ -637,9 +637,8 @@ StartTrainerBattle_LoadPokeBallGraphics:
jr nz, .tile_loop jr nz, .tile_loop
ld hl, .pals ld hl, .pals
ld a, [wTimeOfDayPal] ld a, [wTimeOfDayPalset]
maskbits NUM_DAYTIMES cp DARKNESS_PALSET
cp DARKNESS_F
jr nz, .not_dark jr nz, .not_dark
ld hl, .darkpals ld hl, .darkpals
.not_dark .not_dark

2
engine/battle/start_battle.asm
View File

@ -73,7 +73,7 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_WILD_BATTLE ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [wTimeOfDay] ld a, [wTimeOfDay]
cp NITE_F cp NITE_F
jr nz, .done jr c, .done ; not NITE_F or EVE_F
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done jr .done

2
engine/events/checktime.asm
View File

@ -15,5 +15,5 @@ CheckTime::
db MORN_F, MORN db MORN_F, MORN
db DAY_F, DAY db DAY_F, DAY
db NITE_F, NITE db NITE_F, NITE
db NITE_F, NITE db EVE_F, EVE
db -1 db -1

9
engine/events/poke_seer.asm
View File

@ -181,11 +181,10 @@ GetCaughtLevel:
GetCaughtTime: GetCaughtTime:
ld a, [wSeerCaughtData] ld a, [wSeerCaughtData]
and CAUGHT_TIME_MASK and CAUGHT_TIME_MASK
jr z, .none
rlca rlca
rlca rlca
dec a dec a
maskbits NUM_DAYTIMES
ld hl, .times ld hl, .times
call GetNthString call GetNthString
ld d, h ld d, h
@ -195,15 +194,11 @@ GetCaughtTime:
and a and a
ret ret
.none
ld de, wSeerTimeOfDay
call UnknownCaughtData
ret
.times .times
db "Morning@" db "Morning@"
db "Day@" db "Day@"
db "Night@" db "Night@"
db "Evening@"
UnknownCaughtData: UnknownCaughtData:
ld hl, .unknown ld hl, .unknown

7
engine/events/std_scripts.asm
View File

@ -63,6 +63,8 @@ PokecenterNurseScript:
iftrue .morn iftrue .morn
checktime DAY checktime DAY
iftrue .day iftrue .day
checktime EVE
iftrue .eve
checktime NITE checktime NITE
iftrue .nite iftrue .nite
sjump .ok sjump .ok
@ -77,6 +79,11 @@ PokecenterNurseScript:
promptbutton promptbutton
sjump .ok sjump .ok
.eve
farwritetext NurseEveText
promptbutton
sjump .ok
.nite .nite
farwritetext NurseNiteText farwritetext NurseNiteText
promptbutton promptbutton

45
engine/gfx/color.asm
View File

@ -628,7 +628,7 @@ INCLUDE "data/pokemon/palettes.asm"
INCLUDE "data/trainers/palettes.asm" INCLUDE "data/trainers/palettes.asm"
LoadMapPals: LoadMapPals:
farcall LoadSpecialMapPalette farcall LoadSpecialMapPalette ; also handles darkness palettes
jr c, .got_pals jr c, .got_pals
; Which palette group is based on whether we're outside or inside ; Which palette group is based on whether we're outside or inside
@ -688,6 +688,20 @@ LoadMapPals:
ldh [rSVBK], a ldh [rSVBK], a
.got_pals .got_pals
; BG pals done. Now do OBJ pals.
call GetMapTimeOfDay
bit IN_DARKNESS_F, a
jr z, .not_darkness
ld a, [wStatusFlags]
bit STATUSFLAGS_FLASH_F, a
jr nz, .not_darkness
ld a, BANK(wOBPals1)
ld de, wOBPals1
ld hl, NPCDarknessPalette
ld bc, 8 palettes
jp FarCopyWRAM
.not_darkness
ld a, [wTimeOfDayPal] ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES maskbits NUM_DAYTIMES
ld bc, 8 palettes ld bc, 8 palettes
@ -705,21 +719,21 @@ LoadMapPals:
ret nz ret nz
.outside .outside
ld a, [wMapGroup] ld a, [wMapGroup]
ld l, a add a
ld h, 0 add a
add hl, hl ld e, a
add hl, hl ld d, 0
add hl, hl ld hl, RoofPals
ld de, RoofPals rept NUM_DAYTIMES
add hl, de add hl, de
endr
ld a, [wTimeOfDayPal] ld a, [wTimeOfDayPal]
maskbits NUM_DAYTIMES maskbits NUM_DAYTIMES
cp NITE_F add a
jr c, .morn_day add a
rept 4 ld e, a
inc hl ld d, 0
endr add hl, de
.morn_day
ld de, wBGPals1 palette PAL_BG_ROOF color 1 ld de, wBGPals1 palette PAL_BG_ROOF color 1
ld bc, 4 ld bc, 4
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
@ -737,11 +751,14 @@ INCLUDE "gfx/stats/party_menu_bg.pal"
TilesetBGPalette: TilesetBGPalette:
INCLUDE "gfx/tilesets/bg_tiles.pal" INCLUDE "gfx/tilesets/bg_tiles.pal"
NPCDarknessPalette:
INCLUDE "gfx/overworld/npc_sprites_darkness.pal"
MapObjectPals:: MapObjectPals::
INCLUDE "gfx/overworld/npc_sprites.pal" INCLUDE "gfx/overworld/npc_sprites.pal"
RoofPals: RoofPals:
table_width PAL_COLOR_SIZE * 2 * 2, RoofPals table_width PAL_COLOR_SIZE * 4 * 2, RoofPals
INCLUDE "gfx/tilesets/roofs.pal" INCLUDE "gfx/tilesets/roofs.pal"
assert_table_length NUM_MAP_GROUPS + 1 assert_table_length NUM_MAP_GROUPS + 1

2
engine/menus/main_menu.asm
View File

@ -204,7 +204,7 @@ MainMenu_PrintCurrentTimeAndDay:
db "MORN@" db "MORN@"
db "DAY@" db "DAY@"
db "NITE@" db "NITE@"
db "NITE@" db "EVE@"
ClearTilemapEtc: ClearTilemapEtc:
xor a xor a

3
engine/overworld/wildmons.asm
View File

@ -5,6 +5,7 @@ LoadWildMonData:
xor a xor a
ld [hli], a ld [hli], a
ld [hli], a ld [hli], a
ld [hli], a
ld [hl], a ld [hl], a
jr .done_copy jr .done_copy
@ -12,7 +13,7 @@ LoadWildMonData:
inc hl inc hl
inc hl inc hl
ld de, wMornEncounterRate ld de, wMornEncounterRate
ld bc, 3 ld bc, NUM_DAYTIMES
call CopyBytes call CopyBytes
.done_copy .done_copy
call _WaterWildmonLookup call _WaterWildmonLookup

4
engine/pokegear/radio.asm
View File

@ -231,12 +231,10 @@ OaksPKMNTalk4:
rept 4 rept 4
inc hl inc hl
endr endr
; Generate a number, either 0, 1, or 2, to choose a time of day. ; Generate a number, either 0, 1, 2, or 3 to choose a time of day.
.loop2 .loop2
call Random call Random
maskbits NUM_DAYTIMES maskbits NUM_DAYTIMES
cp DARKNESS_F
jr z, .loop2
ld bc, 2 * NUM_GRASSMON ld bc, 2 * NUM_GRASSMON
call AddNTimes call AddNTimes

1
engine/pokemon/caught_data.asm
View File

@ -166,6 +166,7 @@ SetBoxmonOrEggmonCaughtData:
inc a inc a
rrca rrca
rrca rrca
and CAUGHT_TIME_MASK ; caught in eve becomes $0
ld b, a ld b, a
ld a, [wCurPartyLevel] ld a, [wCurPartyLevel]
or b or b

6
engine/pokemon/evolve.asm
View File

@ -129,16 +129,16 @@ EvolveAfterBattle_MasterLoop:
cp TR_MORNDAY cp TR_MORNDAY
jr z, .happiness_daylight jr z, .happiness_daylight
; TR_NITE ; TR_EVENITE
ld a, [wTimeOfDay] ld a, [wTimeOfDay]
cp NITE_F cp NITE_F
jp nz, .dont_evolve_3 jp c, .dont_evolve_3 ; MORN_F or DAY_F
jr .proceed jr .proceed
.happiness_daylight .happiness_daylight
ld a, [wTimeOfDay] ld a, [wTimeOfDay]
cp NITE_F cp NITE_F
jp z, .dont_evolve_3 jp nc, .dont_evolve_3 ; NITE_F or EVE_F
jr .proceed jr .proceed
.trade .trade

23
engine/tilesets/tileset_palettes.asm
View File

@ -1,4 +1,12 @@
LoadSpecialMapPalette: LoadSpecialMapPalette:
call GetMapTimeOfDay
bit IN_DARKNESS_F, a
jr z, .not_dark
ld a, [wStatusFlags]
bit STATUSFLAGS_FLASH_F, a
jr z, .darkness
.not_dark
ld a, [wMapTileset] ld a, [wMapTileset]
cp TILESET_POKECOM_CENTER cp TILESET_POKECOM_CENTER
jr z, .pokecom_2f jr z, .pokecom_2f
@ -14,6 +22,11 @@ LoadSpecialMapPalette:
jr z, .mansion_mobile jr z, .mansion_mobile
jr .do_nothing jr .do_nothing
.darkness
call LoadDarknessPalette
scf
ret
.pokecom_2f .pokecom_2f
call LoadPokeComPalette call LoadPokeComPalette
scf scf
@ -52,6 +65,16 @@ LoadSpecialMapPalette:
and a and a
ret ret
LoadDarknessPalette:
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, DarknessPalette
ld bc, 8 palettes
jp FarCopyWRAM
DarknessPalette:
INCLUDE "gfx/tilesets/bg_tiles_darkness.pal"
LoadPokeComPalette: LoadPokeComPalette:
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
ld de, wBGPals1 ld de, wBGPals1

42
engine/tilesets/timeofday_pals.asm
View File

@ -185,10 +185,18 @@ endr
ret ret
ReplaceTimeOfDayPals: ReplaceTimeOfDayPals:
ld a, [wMapTimeOfDay]
bit IN_DARKNESS_F, a
jr z, .not_dark
ld a, [wStatusFlags]
bit STATUSFLAGS_FLASH_F, a
jr nz, .not_dark
ld a, DARKNESS_PALSET
jr .done
.not_dark:
ld hl, .BrightnessLevels ld hl, .BrightnessLevels
ld a, [wMapTimeOfDay] ld a, [wMapTimeOfDay]
cp PALETTE_DARK
jr z, .NeedsFlash
maskbits NUM_MAP_PALETTES maskbits NUM_MAP_PALETTES
add l add l
ld l, a ld l, a
@ -196,33 +204,21 @@ ReplaceTimeOfDayPals:
adc h adc h
ld h, a ld h, a
ld a, [hl] ld a, [hl]
ld [wTimeOfDayPalset], a .done
ret
.NeedsFlash:
ld a, [wStatusFlags]
bit STATUSFLAGS_FLASH_F, a
jr nz, .UsedFlash
ld a, DARKNESS_PALSET
ld [wTimeOfDayPalset], a
ret
.UsedFlash:
ld a, (NITE_F << 6) | (NITE_F << 4) | (NITE_F << 2) | NITE_F
ld [wTimeOfDayPalset], a ld [wTimeOfDayPalset], a
ret ret
.BrightnessLevels: .BrightnessLevels:
; actual palettes used when time is ; actual palettes used when time is
; DARKNESS_F, NITE_F, DAY_F, MORN_F ; EVE_F, NITE_F, DAY_F, MORN_F
dc DARKNESS_F, NITE_F, DAY_F, MORN_F ; PALETTE_AUTO dc EVE_F, NITE_F, DAY_F, MORN_F ; PALETTE_AUTO
dc DAY_F, DAY_F, DAY_F, DAY_F ; PALETTE_DAY dc DAY_F, DAY_F, DAY_F, DAY_F ; PALETTE_DAY
dc NITE_F, NITE_F, NITE_F, NITE_F ; PALETTE_NITE dc NITE_F, NITE_F, NITE_F, NITE_F ; PALETTE_NITE
dc MORN_F, MORN_F, MORN_F, MORN_F ; PALETTE_MORN dc MORN_F, MORN_F, MORN_F, MORN_F ; PALETTE_MORN
dc DARKNESS_F, DARKNESS_F, DARKNESS_F, DARKNESS_F ; PALETTE_DARK dc EVE_F, EVE_F, EVE_F, EVE_F ; PALETTE_EVE
dc DARKNESS_F, NITE_F, DAY_F, MORN_F dc EVE_F, NITE_F, DAY_F, MORN_F
dc DARKNESS_F, NITE_F, DAY_F, MORN_F dc EVE_F, NITE_F, DAY_F, MORN_F
dc DARKNESS_F, NITE_F, DAY_F, MORN_F dc EVE_F, NITE_F, DAY_F, MORN_F
GetTimePalette: GetTimePalette:
jumptable .TimePalettes, wTimeOfDay jumptable .TimePalettes, wTimeOfDay
@ -231,7 +227,7 @@ GetTimePalette:
dw .MorningPalette ; MORN_F dw .MorningPalette ; MORN_F
dw .DayPalette ; DAY_F dw .DayPalette ; DAY_F
dw .NitePalette ; NITE_F dw .NitePalette ; NITE_F
dw .DarknessPalette ; DARKNESS_F dw .EveningPalette ; EVE_F
.MorningPalette: .MorningPalette:
ld a, [wTimeOfDayPalset] ld a, [wTimeOfDayPalset]
@ -251,7 +247,7 @@ GetTimePalette:
swap a swap a
ret ret
.DarknessPalette: .EveningPalette:
ld a, [wTimeOfDayPalset] ld a, [wTimeOfDayPalset]
and %11000000 and %11000000
rlca rlca

16
gfx/overworld/npc_sprites.pal
View File

@ -28,12 +28,12 @@
RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree
RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock
; dark ; eve
RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red RGB 31,21,14, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue RGB 31,21,14, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green RGB 31,21,14, 31,19,10, 07,23,03, 00,00,00 ; green
RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown RGB 31,21,14, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink RGB 31,21,14, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree RGB 19,23,08, 10,19,01, 04,10,00, 06,05,05 ; tree
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; rock

9
gfx/overworld/npc_sprites_darkness.pal Executable file
View File

@ -0,0 +1,9 @@
; dark
RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red
RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue
RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green
RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown
RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink
RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock

24
gfx/tilesets/bg_tiles.pal
View File

@ -28,17 +28,17 @@
RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; dark ; eve
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; gray RGB 31,21,14, 18,16,16, 11,10,10, 06,05,05 ; gray
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; red RGB 31,21,14, 25,14,18, 24,08,05, 06,05,05 ; red
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; green RGB 19,23,08, 10,19,01, 04,10,00, 06,05,05 ; green
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; water RGB 31,21,14, 07,09,23, 01,03,23, 06,05,05 ; water
RGB 30,30,11, 00,00,00, 00,00,00, 00,00,00 ; yellow RGB 31,31,07, 27,21,10, 25,12,01, 06,05,05 ; yellow
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; brown RGB 31,21,14, 21,13,05, 16,09,01, 06,05,05 ; brown
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; roof RGB 31,21,14, 13,23,23, 04,13,23, 06,05,05 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; indoor ; indoor (morn/day)
RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray RGB 30,28,26, 19,19,19, 13,13,13, 07,07,07 ; gray
RGB 30,28,26, 31,19,24, 30,10,06, 07,07,07 ; red RGB 30,28,26, 31,19,24, 30,10,06, 07,07,07 ; red
RGB 18,24,09, 15,20,01, 09,13,00, 07,07,07 ; green RGB 18,24,09, 15,20,01, 09,13,00, 07,07,07 ; green
@ -48,6 +48,8 @@
RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof RGB 30,28,26, 17,19,31, 14,16,31, 07,07,07 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; overworld water ; overworld water (outdoor)
RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn/day RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn
RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; day
RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; nite RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; nite
RGB 31,21,14, 16,14,23, 11,09,23, 06,05,05 ; eve

9
gfx/tilesets/bg_tiles_darkness.pal Executable file
View File

@ -0,0 +1,9 @@
; dark
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; gray
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; red
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; green
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; water
RGB 30,30,11, 00,00,00, 00,00,00, 00,00,00 ; yellow
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; brown
RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; roof
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text

108
gfx/tilesets/roofs.pal
View File

@ -1,107 +1,161 @@
; group 0 (unused) ; group 0 (unused)
RGB 21,21,21, 11,11,11 ; morn/day RGB 21,21,21, 11,11,11 ; morn
RGB 21,21,21, 11,11,11 ; day
RGB 21,21,21, 11,11,11 ; nite RGB 21,21,21, 11,11,11 ; nite
RGB 18,16,16, 09,08,08 ; eve
; group 1 (Level1) ; group 1 (Level1)
RGB 14,17,31, 07,11,15 ; morn/day RGB 14,17,31, 07,11,15 ; morn
RGB 14,17,31, 07,11,15 ; day
RGB 09,09,17, 05,07,13 ; nite RGB 09,09,17, 05,07,13 ; nite
RGB 12,13,23, 06,08,11 ; eve
; group 2 (Mahogany) ; group 2 (Mahogany)
; RGB 12,19,00, 06,10,00 ; morn/day ; RGB 12,19,00, 06,10,00 ; morn
; RGB 12,19,00, 06,10,00 ; day
; RGB 06,09,07, 04,05,06 ; nite ; RGB 06,09,07, 04,05,06 ; nite
; RGB 10,14,00, 05,08,00 ; eve
; group 3 (dungeons) ; group 3 (dungeons)
; RGB 21,21,21, 11,11,11 ; morn/day ; RGB 21,21,21, 11,11,11 ; morn
; RGB 21,21,21, 11,11,11 ; day
; RGB 21,21,21, 17,08,07 ; nite ; RGB 21,21,21, 17,08,07 ; nite
; RGB 18,16,16, 09,08,08 ; eve
; group 4 (Ecruteak) ; group 4 (Ecruteak)
; RGB 31,19,00, 27,10,05 ; morn/day ; RGB 31,19,00, 27,10,05 ; morn
; RGB 31,19,00, 27,10,05 ; day
; RGB 15,07,02, 11,04,02 ; nite ; RGB 15,07,02, 11,04,02 ; nite
; RGB 25,14,00, 22,08,03 ; eve
; group 5 (Blackthorn) ; group 5 (Blackthorn)
; RGB 11,10,16, 05,06,07 ; morn/day ; RGB 11,10,16, 05,06,07 ; morn
; RGB 11,10,16, 05,06,07 ; day
; RGB 03,04,08, 00,00,00 ; nite ; RGB 03,04,08, 00,00,00 ; nite
; RGB 09,08,12, 04,04,05 ; eve
; group 6 (Cinnabar) ; group 6 (Cinnabar)
; RGB 31,10,00, 18,06,00 ; morn/day ; RGB 31,10,00, 18,06,00 ; morn
; RGB 31,10,00, 18,06,00 ; day
; RGB 18,05,09, 17,08,07 ; nite ; RGB 18,05,09, 17,08,07 ; nite
; RGB 25,08,00, 15,04,00 ; eve
; group 7 (Cerulean) ; group 7 (Cerulean)
; RGB 17,27,31, 05,15,31 ; morn/day ; RGB 17,27,31, 05,15,31 ; morn
; RGB 17,27,31, 05,15,31 ; day
; RGB 07,08,22, 07,07,16 ; nite ; RGB 07,08,22, 07,07,16 ; nite
; RGB 14,21,23, 04,11,23 ; eve
; group 8 (Azalea) ; group 8 (Azalea)
; RGB 22,20,10, 17,14,03 ; morn/day ; RGB 22,20,10, 17,14,03 ; morn
; RGB 22,20,10, 17,14,03 ; day
; RGB 11,11,05, 10,09,07 ; nite ; RGB 11,11,05, 10,09,07 ; nite
; RGB 19,15,08, 14,10,01 ; eve
; group 9 (Lake of Rage) ; group 9 (Lake of Rage)
; RGB 31,08,04, 09,09,08 ; morn/day ; RGB 31,08,04, 09,09,08 ; morn
; RGB 31,08,04, 09,09,08 ; day
; RGB 18,05,09, 09,09,08 ; nite ; RGB 18,05,09, 09,09,08 ; nite
; RGB 25,06,02, 08,07,06 ; eve
; group 10 (Violet) ; group 10 (Violet)
; RGB 24,14,31, 13,07,21 ; morn/day ; RGB 24,14,31, 13,07,21 ; morn
; RGB 24,14,31, 13,07,21 ; day
; RGB 12,03,18, 09,03,15 ; nite ; RGB 12,03,18, 09,03,15 ; nite
; RGB 21,10,23, 11,05,16 ; eve
; group 11 (Goldenrod) ; group 11 (Goldenrod)
; RGB 25,25,00, 20,17,08 ; morn/day ; RGB 25,25,00, 20,17,08 ; morn
; RGB 25,25,00, 20,17,08 ; day
; RGB 12,12,00, 10,09,05 ; nite ; RGB 12,12,00, 10,09,05 ; nite
; RGB 21,19,00, 17,13,06 ; eve
; group 12 (Vermilion) ; group 12 (Vermilion)
; RGB 27,23,01, 23,11,00 ; morn/day ; RGB 27,23,01, 23,11,00 ; morn
; RGB 27,23,01, 23,11,00 ; day
; RGB 15,11,01, 11,10,01 ; nite ; RGB 15,11,01, 11,10,01 ; nite
; RGB 21,19,00, 17,13,06 ; eve
; group 13 (Pallet) ; group 13 (Pallet)
; RGB 27,28,31, 17,19,22 ; morn/day ; RGB 27,28,31, 17,19,22 ; morn
; RGB 27,28,31, 17,19,22 ; day
; RGB 14,14,18, 10,09,13 ; nite ; RGB 14,14,18, 10,09,13 ; nite
; RGB 25,12,10, 21,08,06 ; eve
; group 14 (Pewter) ; group 14 (Pewter)
; RGB 19,19,16, 10,12,15 ; morn/day ; RGB 19,19,16, 10,12,15 ; morn
; RGB 19,19,16, 10,12,15 ; day
; RGB 09,09,11, 04,05,07 ; nite ; RGB 09,09,11, 04,05,07 ; nite
; RGB 16,14,12, 08,09,11 ; eve
; group 15 (Mount Moon Square) ; group 15 (Mount Moon Square)
; RGB 14,17,31, 07,11,15 ; morn/day ; RGB 14,17,31, 07,11,15 ; morn
; RGB 14,17,31, 07,11,15 ; day
; RGB 09,13,19, 07,07,16 ; nite ; RGB 09,13,19, 07,07,16 ; nite
; RGB 12,13,23, 06,08,11 ; eve
; group 16 (Indigo) ; group 16 (Indigo)
; RGB 21,21,21, 13,13,13 ; morn/day ; RGB 21,21,21, 13,13,13 ; morn
; RGB 21,21,21, 13,13,13 ; day
; RGB 11,11,19, 07,07,12 ; nite ; RGB 11,11,19, 07,07,12 ; nite
; RGB 20,19,19, 11,10,10 ; eve
; group 17 (Fuchsia) ; group 17 (Fuchsia)
; RGB 31,18,29, 17,13,20 ; morn/day ; RGB 31,18,29, 17,13,20 ; morn
; RGB 31,18,29, 17,13,20 ; day
; RGB 14,06,12, 11,03,10 ; nite ; RGB 14,06,12, 11,03,10 ; nite
; RGB 25,13,21, 14,10,15 ; eve
; group 18 (Lavender) ; group 18 (Lavender)
; RGB 23,15,31, 16,05,31 ; morn/day ; RGB 23,15,31, 16,05,31 ; morn
; RGB 23,15,31, 16,05,31 ; day
; RGB 12,07,17, 08,06,10 ; nite ; RGB 12,07,17, 08,06,10 ; nite
; RGB 20,11,23, 13,03,23 ; eve
; group 19 (Silver Cave) ; group 19 (Silver Cave)
; RGB 21,21,25, 16,16,16 ; morn/day ; RGB 21,21,25, 16,16,16 ; morn
; RGB 21,21,25, 16,16,16 ; day
; RGB 13,13,13, 07,07,07 ; nite ; RGB 13,13,13, 07,07,07 ; nite
; RGB 08,18,22, 08,10,19 ; eve
; group 20 (Cable Club) ; group 20 (Cable Club)
; RGB 21,21,21, 11,11,11 ; morn/day ; RGB 21,21,21, 11,11,11 ; morn
; RGB 21,21,21, 11,11,11 ; day
; RGB 21,21,21, 11,11,11 ; nite ; RGB 21,21,21, 11,11,11 ; nite
; RGB 20,19,19, 10,09,09 ; eve
; group 21 (Celadon) ; group 21 (Celadon)
; RGB 19,31,15, 31,22,02 ; morn/day ; RGB 19,31,15, 31,22,02 ; morn
; RGB 19,31,15, 31,22,02 ; day
; RGB 12,13,09, 09,12,03 ; nite ; RGB 12,13,09, 09,12,03 ; nite
; RGB 11,19,02, 04,14,04 ; eve
; group 22 (Cianwood) ; group 22 (Cianwood)
; RGB 15,10,31, 07,05,15 ; morn/day ; RGB 15,10,31, 07,05,15 ; morn
; RGB 15,10,31, 07,05,15 ; day
; RGB 06,05,17, 02,02,08 ; nite ; RGB 06,05,17, 02,02,08 ; nite
; RGB 13,08,23, 06,03,11 ; eve
; group 23 (Viridian) ; group 23 (Viridian)
; RGB 21,31,07, 13,25,04 ; morn/day ; RGB 21,31,07, 13,25,04 ; morn
; RGB 21,31,07, 13,25,04 ; day
; RGB 09,14,08, 06,10,04 ; nite ; RGB 09,14,08, 06,10,04 ; nite
; RGB 18,24,05, 11,19,02 ; eve
; group 24 (New Bark) ; group 24 (New Bark)
; RGB 20,31,14, 11,23,05 ; morn/day ; RGB 20,31,14, 11,23,05 ; morn
; RGB 20,31,14, 11,23,05 ; day
; RGB 09,13,08, 06,09,04 ; nite ; RGB 09,13,08, 06,09,04 ; nite
; RGB 17,24,10, 09,18,03 ; eve
; group 25 (Saffron) ; group 25 (Saffron)
; RGB 31,26,00, 31,15,00 ; morn/day ; RGB 31,26,00, 31,15,00 ; morn
; RGB 31,26,00, 31,15,00 ; day
; RGB 13,13,01, 08,08,01 ; nite ; RGB 13,13,01, 08,08,01 ; nite
; RGB 25,20,00, 25,11,00 ; eve
; group 26 (Cherrygrove) ; group 26 (Cherrygrove)
; RGB 31,14,28, 31,05,21 ; morn/day ; RGB 31,14,28, 31,05,21 ; morn
; RGB 31,14,28, 31,05,21 ; day
; RGB 14,07,17, 13,00,08 ; nite ; RGB 14,07,17, 13,00,08 ; nite
; RGB 25,10,20, 25,03,16 ; eve

1
home/map_objects.asm
View File

@ -262,6 +262,7 @@ CheckObjectTime::
db MORN db MORN
db DAY db DAY
db NITE db NITE
db EVE
.check_hour .check_hour
ld hl, MAPOBJECT_HOUR_1 ld hl, MAPOBJECT_HOUR_1

1
ram/wram.asm
View File

@ -2064,6 +2064,7 @@ wCurDamage:: dw
wMornEncounterRate:: db wMornEncounterRate:: db
wDayEncounterRate:: db wDayEncounterRate:: db
wNiteEncounterRate:: db wNiteEncounterRate:: db
wEveEncounterRate:: db
wWaterEncounterRate:: db wWaterEncounterRate:: db
wListMoves_MoveIndicesBuffer:: ds NUM_MOVES wListMoves_MoveIndicesBuffer:: ds NUM_MOVES
wPutativeTMHMMove:: db wPutativeTMHMMove:: db