diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_data_constants.asm | 1 | ||||
| -rw-r--r-- | constants/radio_constants.asm | 7 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index b2c47006..386d7229 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -32,6 +32,7 @@ MAP_NONE EQU 0 const PALETTE_NITE const PALETTE_MORN const PALETTE_DARK +NUM_MAP_PALETTES EQU const_value ; FishGroups indexes (see data/wild/fish.asm) const_def diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index e9b54176..557b7dde 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -85,9 +85,12 @@ const MAPRADIO_LETS_ALL_SING const MAPRADIO_ROCKET +; OaksPKMNTalkRoutes size (see data/radio/oaks_pkmn_talk_routes.asm) +NUM_OAKS_POKEMON_TALK_ROUTES EQU 15 + ; These tables in engine/pokegear/radio.asm are all sized to a power of 2 ; so there's no need for a rejection sampling loop NUM_OAKS_POKEMON_TALK_ADVERBS EQU 16 ; OaksPKMNTalk8.Adverbs NUM_OAKS_POKEMON_TALK_ADJECTIVES EQU 16 ; OaksPKMNTalk9.Adjectives -NUM_PNP_PEOPLE_ADJECTIVES EQU 16 ; PeoplePlaces5.Adjectives -NUM_PNP_PLACES_ADJECTIVES EQU 16 ; PeoplePlaces7.Adjectives +NUM_PNP_PEOPLE_ADJECTIVES EQU 16 ; PeoplePlaces5.Adjectives +NUM_PNP_PLACES_ADJECTIVES EQU 16 ; PeoplePlaces7.Adjectives diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 146d24f2..9150cc21 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -122,6 +122,9 @@ DARKNESS EQU 1 << DARKNESS_F ANYTIME EQU MORN | DAY | NITE +; wTimeOfDayPalset:: +DARKNESS_PALSET EQU (DARKNESS_F << 6) | (DARKNESS_F << 4) | (DARKNESS_F << 2) | DARKNESS_F + ; wBattleAnimFlags:: const_def const BATTLEANIM_STOP_F ; 0 |