From e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Thu, 22 Feb 2018 17:13:29 +0100 Subject: Pkmn -> Mon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the or characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers. --- constants/battle_tower_constants.asm | 2 +- constants/radio_constants.asm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'constants') diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm index 71b8de8be..5a4048550 100755 --- a/constants/battle_tower_constants.asm +++ b/constants/battle_tower_constants.asm @@ -1,7 +1,7 @@ BATTLETOWER_PARTY_LENGTH EQU 3 BATTLETOWER_STREAK_LENGTH EQU 7 -BATTLETOWER_NUM_UNIQUE_PKMN EQU 21 +BATTLETOWER_NUM_UNIQUE_MON EQU 21 BATTLETOWER_NUM_UNIQUE_TRAINERS EQU 70 BATTLETOWER_TRAINERDATALENGTH EQU $24 diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index d3f14e34c..8903ef005 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -97,7 +97,7 @@ ; PlayRadio.StationPointers indexes (see engine/pokegear.asm) const_def const MAPRADIO_POKEMON_CHANNEL - const MAPRADIO_OAKS_MON_TALK + const MAPRADIO_OAKS_POKEMON_TALK const MAPRADIO_POKEDEX_SHOW const MAPRADIO_POKEMON_MUSIC const MAPRADIO_LUCKY_CHANNEL @@ -108,8 +108,8 @@ ; These tables in engine/radio.asm are all sized to a power of 2 ; so there's no need for a rejection sampling loop -NUM_OAKS_MON_TALK_ADVERBS EQU 16 ; OaksPkmnTalk8.Adverbs -NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives +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 -- cgit v1.2.3