diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/pokemon_data_constants.asm | 18 | ||||
| -rw-r--r-- | constants/radio_constants.asm | 173 |
2 files changed, 87 insertions, 104 deletions
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index caacc8d1..838c8036 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -102,6 +102,24 @@ NUM_WATERMON EQU 3 GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2 WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2 +; treemon sets +; TreeMons indexes (see data/wild/treemons.asm) + const_def + const TREEMON_SET_NONE + const TREEMON_SET_FOREST + const TREEMON_SET_CANYON + const TREEMON_SET_ROCK +NUM_TREEMON_SETS EQU const_value +; last 2 are unused/ignored + const TREEMON_SET_UNUSED + const TREEMON_SET_CITY + +; treemon scores + const_def + const TREEMON_SCORE_BAD ; 0 + const TREEMON_SCORE_GOOD ; 1 + const TREEMON_SCORE_RARE ; 2 + ; ChangeHappiness arguments (see data/happiness_changes.asm) const_value = 1 const HAPPINESS_GAINLEVEL ; 01 diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index 14bc75a4..b1c2c287 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -3,90 +3,69 @@ const POKEDEX_SHOW ; $01 const POKEMON_MUSIC ; $02 const LUCKY_CHANNEL ; $03 - const BUENAS_PASSWORD ; $04 - const PLACES_AND_PEOPLE ; $05 - const LETS_ALL_SING ; $06 - const ROCKET_RADIO ; $07 - const POKE_FLUTE_RADIO ; $08 - const UNOWN_RADIO ; $09 - const EVOLUTION_RADIO ; $0a - const OAKS_POKEMON_TALK_2 ; $0b - const OAKS_POKEMON_TALK_3 ; $0c - const OAKS_POKEMON_TALK_4 ; $0d - const OAKS_POKEMON_TALK_5 ; $0e - const OAKS_POKEMON_TALK_6 ; $0f - const OAKS_POKEMON_TALK_7 ; $10 - const OAKS_POKEMON_TALK_8 ; $11 - const OAKS_POKEMON_TALK_9 ; $12 - const POKEDEX_SHOW_2 ; $13 - const POKEDEX_SHOW_3 ; $14 - const POKEDEX_SHOW_4 ; $15 - const POKEDEX_SHOW_5 ; $16 - const POKEMON_MUSIC_2 ; $17 - const POKEMON_MUSIC_3 ; $18 - const POKEMON_MUSIC_4 ; $19 - const POKEMON_MUSIC_5 ; $1a - const POKEMON_MUSIC_6 ; $1b - const POKEMON_MUSIC_7 ; $1c - const LETS_ALL_SING_2 ; $1d - const LUCKY_NUMBER_SHOW_2 ; $1e - const LUCKY_NUMBER_SHOW_3 ; $1f - const LUCKY_NUMBER_SHOW_4 ; $20 - const LUCKY_NUMBER_SHOW_5 ; $21 - const LUCKY_NUMBER_SHOW_6 ; $22 - const LUCKY_NUMBER_SHOW_7 ; $23 - const LUCKY_NUMBER_SHOW_8 ; $24 - const LUCKY_NUMBER_SHOW_9 ; $25 - const LUCKY_NUMBER_SHOW_10 ; $26 - const LUCKY_NUMBER_SHOW_11 ; $27 - const LUCKY_NUMBER_SHOW_12 ; $28 - const LUCKY_NUMBER_SHOW_13 ; $29 - const LUCKY_NUMBER_SHOW_14 ; $2a - const LUCKY_NUMBER_SHOW_15 ; $2b - const PLACES_AND_PEOPLE_2 ; $2c - const PLACES_AND_PEOPLE_3 ; $2d - const PLACES_AND_PEOPLE_4 ; $2e - const PLACES_AND_PEOPLE_5 ; $2f - const PLACES_AND_PEOPLE_6 ; $30 - const PLACES_AND_PEOPLE_7 ; $31 - const ROCKET_RADIO_2 ; $32 - const ROCKET_RADIO_3 ; $33 - const ROCKET_RADIO_4 ; $34 - const ROCKET_RADIO_5 ; $35 - const ROCKET_RADIO_6 ; $36 - const ROCKET_RADIO_7 ; $37 - const ROCKET_RADIO_8 ; $38 - const ROCKET_RADIO_9 ; $39 - const ROCKET_RADIO_10 ; $3a - const OAKS_POKEMON_TALK_10 ; $3b - const OAKS_POKEMON_TALK_11 ; $3c - const OAKS_POKEMON_TALK_12 ; $3d - const OAKS_POKEMON_TALK_13 ; $3e - const OAKS_POKEMON_TALK_14 ; $3f - const BUENAS_PASSWORD_2 ; $40 - const BUENAS_PASSWORD_3 ; $41 - const BUENAS_PASSWORD_4 ; $42 - const BUENAS_PASSWORD_5 ; $43 - const BUENAS_PASSWORD_6 ; $44 - const BUENAS_PASSWORD_7 ; $45 - const BUENAS_PASSWORD_8 ; $46 - const BUENAS_PASSWORD_9 ; $47 - const BUENAS_PASSWORD_10 ; $48 - const BUENAS_PASSWORD_11 ; $49 - const BUENAS_PASSWORD_12 ; $4a - const BUENAS_PASSWORD_13 ; $4b - const BUENAS_PASSWORD_14 ; $4c - const BUENAS_PASSWORD_15 ; $4d - const BUENAS_PASSWORD_16 ; $4e - const BUENAS_PASSWORD_17 ; $4f - const BUENAS_PASSWORD_18 ; $50 - const BUENAS_PASSWORD_19 ; $51 - const BUENAS_PASSWORD_20 ; $52 - const BUENAS_PASSWORD_21 ; $53 - const RADIO_SCROLL ; $54 - const POKEDEX_SHOW_6 ; $55 - const POKEDEX_SHOW_7 ; $56 - const POKEDEX_SHOW_8 ; $57 + const PLACES_AND_PEOPLE ; $04 + const LETS_ALL_SING ; $05 + const ROCKET_RADIO ; $06 + const POKE_FLUTE_RADIO ; $07 + const UNOWN_RADIO ; $08 + const EVOLUTION_RADIO ; $09 + const OAKS_POKEMON_TALK_2 ; $0a + const OAKS_POKEMON_TALK_3 ; $0b + const OAKS_POKEMON_TALK_4 ; $0c + const OAKS_POKEMON_TALK_5 ; $0d + const OAKS_POKEMON_TALK_6 ; $0e + const OAKS_POKEMON_TALK_7 ; $0f + const OAKS_POKEMON_TALK_8 ; $10 + const OAKS_POKEMON_TALK_9 ; $11 + const POKEDEX_SHOW_2 ; $12 + const POKEDEX_SHOW_3 ; $13 + const POKEDEX_SHOW_4 ; $14 + const POKEDEX_SHOW_5 ; $15 + const POKEMON_MUSIC_2 ; $16 + const POKEMON_MUSIC_3 ; $17 + const POKEMON_MUSIC_4 ; $18 + const POKEMON_MUSIC_5 ; $19 + const POKEMON_MUSIC_6 ; $1a + const POKEMON_MUSIC_7 ; $1b + const LETS_ALL_SING_2 ; $1c + const LUCKY_NUMBER_SHOW_2 ; $1d + const LUCKY_NUMBER_SHOW_3 ; $1e + const LUCKY_NUMBER_SHOW_4 ; $1f + const LUCKY_NUMBER_SHOW_5 ; $20 + const LUCKY_NUMBER_SHOW_6 ; $21 + const LUCKY_NUMBER_SHOW_7 ; $22 + const LUCKY_NUMBER_SHOW_8 ; $23 + const LUCKY_NUMBER_SHOW_9 ; $24 + const LUCKY_NUMBER_SHOW_10 ; $25 + const LUCKY_NUMBER_SHOW_11 ; $26 + const LUCKY_NUMBER_SHOW_12 ; $27 + const LUCKY_NUMBER_SHOW_13 ; $28 + const LUCKY_NUMBER_SHOW_14 ; $29 + const LUCKY_NUMBER_SHOW_15 ; $2a + const PLACES_AND_PEOPLE_2 ; $2b + const PLACES_AND_PEOPLE_3 ; $2c + const PLACES_AND_PEOPLE_4 ; $2d + const PLACES_AND_PEOPLE_5 ; $2e + const PLACES_AND_PEOPLE_6 ; $2f + const PLACES_AND_PEOPLE_7 ; $30 + const ROCKET_RADIO_2 ; $31 + const ROCKET_RADIO_3 ; $32 + const ROCKET_RADIO_4 ; $33 + const ROCKET_RADIO_5 ; $34 + const ROCKET_RADIO_6 ; $35 + const ROCKET_RADIO_7 ; $36 + const ROCKET_RADIO_8 ; $37 + const ROCKET_RADIO_9 ; $38 + const ROCKET_RADIO_10 ; $39 + const OAKS_POKEMON_TALK_10 ; $3a + const OAKS_POKEMON_TALK_11 ; $3b + const OAKS_POKEMON_TALK_12 ; $3c + const OAKS_POKEMON_TALK_13 ; $3d + const OAKS_POKEMON_TALK_14 ; $3e + const RADIO_SCROLL ; $3f + const POKEDEX_SHOW_6 ; $40 + const POKEDEX_SHOW_7 ; $41 + const POKEDEX_SHOW_8 ; $42 const_def const MAPRADIO_POKEMON_CHANNEL @@ -99,23 +78,9 @@ const MAPRADIO_LETS_ALL_SING const MAPRADIO_ROCKET - const_def - const BUENA_MON - const BUENA_ITEM - const BUENA_MOVE - const BUENA_STRING - - const_def - const BUENA_STARTERS - const BUENA_DRINKS - const BUENA_ITEMS - const BUENA_BALLS - const BUENA_MON1 - const BUENA_MON2 - const BUENA_TOWNS - const BUENA_TYPES - const BUENA_MOVES - const BUENA_XITEMS - const BUENA_STATIONS -NUM_PASSWORD_CATEGORIES EQU const_value -NUM_PASSWORDS_PER_CATEGORY EQU 3 +; 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 |