Pkmn -> Mon

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 <PK><MN> or <PKMN> 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.

1 files changed, 39 insertions, 39 deletions

diff --git a/engine/radio.asm b/engine/radio.asm
index e6ee257ee..f0326f167 100644
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -29,7 +29,7 @@ PlayRadioShow:
 
 RadioJumptable:
 ; entries correspond to constants/radio_constants.asm
-	dw OaksPkmnTalk1  ; $00
+	dw OaksPKMNTalk1  ; $00
 	dw PokedexShow1 ; $01
 	dw BenMonMusic1  ; $02
 	dw LuckyNumberShow1 ; $03
@@ -40,15 +40,15 @@ RadioJumptable:
 	dw PokeFluteRadio ; $08
 	dw UnownRadio ; $09
 	dw EvolutionRadio ; $0a
-; OaksPkmnTalk
-	dw OaksPkmnTalk2  ; $0b
-	dw OaksPkmnTalk3  ; $0c
-	dw OaksPkmnTalk4  ; $0d
-	dw OaksPkmnTalk5  ; $0e
-	dw OaksPkmnTalk6  ; $0f
-	dw OaksPkmnTalk7  ; $10
-	dw OaksPkmnTalk8  ; $11
-	dw OaksPkmnTalk9  ; $12
+; OaksPKMNTalk
+	dw OaksPKMNTalk2  ; $0b
+	dw OaksPKMNTalk3  ; $0c
+	dw OaksPKMNTalk4  ; $0d
+	dw OaksPKMNTalk5  ; $0e
+	dw OaksPKMNTalk6  ; $0f
+	dw OaksPKMNTalk7  ; $10
+	dw OaksPKMNTalk8  ; $11
+	dw OaksPKMNTalk9  ; $12
 	dw PokedexShow2 ; $13
 	dw PokedexShow3 ; $14
 	dw PokedexShow4 ; $15
@@ -94,11 +94,11 @@ RadioJumptable:
 	dw RocketRadio9 ; $39
 	dw RocketRadio10 ; $3a
 ; More Pokemon Channel stuff
-	dw OaksPkmnTalk10 ; $3b
-	dw OaksPkmnTalk11 ; $3c
-	dw OaksPkmnTalk12 ; $3d
-	dw OaksPkmnTalk13 ; $3e
-	dw OaksPkmnTalk14 ; $3f
+	dw OaksPKMNTalk10 ; $3b
+	dw OaksPKMNTalk11 ; $3c
+	dw OaksPKMNTalk12 ; $3d
+	dw OaksPKMNTalk13 ; $3e
+	dw OaksPKMNTalk14 ; $3f
 ; Buenas Password
 	dw BuenasPassword2 ; $40
 	dw BuenasPassword3 ; $41
@@ -182,33 +182,33 @@ RadioScroll:
 	call nz, CopyBottomLineToTopLine
 	jp ClearBottomLine
 
-OaksPkmnTalk1:
+OaksPKMNTalk1:
 	ld a, 5
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	call StartRadioStation
 	ld hl, OPT_IntroText1
 	ld a, OAKS_POKEMON_TALK_2
 	jp NextRadioLine
 
-OaksPkmnTalk2:
+OaksPKMNTalk2:
 	ld hl, OPT_IntroText2
 	ld a, OAKS_POKEMON_TALK_3
 	jp NextRadioLine
 
-OaksPkmnTalk3:
+OaksPKMNTalk3:
 	ld hl, OPT_IntroText3
 	ld a, OAKS_POKEMON_TALK_4
 	jp NextRadioLine
 
-OaksPkmnTalk4:
+OaksPKMNTalk4:
 ; Choose a random route, and a random Pokemon from that route.
 .sample
 	call Random
 	and %11111
-	cp (OaksPkmnTalkRoutesEnd - OaksPkmnTalkRoutes) / 2
+	cp (OaksPKMNTalkRoutesEnd - OaksPKMNTalkRoutes) / 2
 	jr nc, .sample
 	; We now have a number between 0 and 14.
-	ld hl, OaksPkmnTalkRoutes
+	ld hl, OaksPKMNTalkRoutes
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -294,12 +294,12 @@ endr
 
 INCLUDE "data/radio/oaks_pkmn_talk_routes.asm"
 
-OaksPkmnTalk5:
+OaksPKMNTalk5:
 	ld hl, OPT_OakText2
 	ld a, OAKS_POKEMON_TALK_6
 	jp NextRadioLine
 
-OaksPkmnTalk6:
+OaksPKMNTalk6:
 	ld hl, OPT_OakText3
 	ld a, OAKS_POKEMON_TALK_7
 	jp NextRadioLine
@@ -334,7 +334,7 @@ OPT_OakText3:
 	text_jump _OPT_OakText3
 	db "@"
 
-OaksPkmnTalk7:
+OaksPKMNTalk7:
 	ld a, [wCurPartySpecies]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
@@ -347,11 +347,11 @@ OPT_MaryText1:
 	text_jump _OPT_MaryText1
 	db "@"
 
-OaksPkmnTalk8:
+OaksPKMNTalk8:
 	; 0-15 are all valid indexes into .Adverbs,
 	; so no need for a retry loop
 	call Random
-	maskbits NUM_OAKS_MON_TALK_ADVERBS
+	maskbits NUM_OAKS_POKEMON_TALK_ADVERBS
 	ld e, a
 	ld d, 0
 	ld hl, .Adverbs
@@ -364,7 +364,7 @@ OaksPkmnTalk8:
 	jp NextRadioLine
 
 .Adverbs:
-; there are NUM_OAKS_MON_TALK_ADVERBS entries
+; there are NUM_OAKS_POKEMON_TALK_ADVERBS entries
 	dw .sweetadorably
 	dw .wigglyslickly
 	dw .aptlynamed
@@ -462,11 +462,11 @@ OaksPkmnTalk8:
 	text_jump OPT_HeartMeltingly
 	db "@"
 
-OaksPkmnTalk9:
+OaksPKMNTalk9:
 	; 0-15 are all valid indexes into .Adjectives,
 	; so no need for a retry loop
 	call Random
-	maskbits NUM_OAKS_MON_TALK_ADJECTIVES
+	maskbits NUM_OAKS_POKEMON_TALK_ADJECTIVES
 	ld e, a
 	ld d, 0
 	ld hl, .Adjectives
@@ -475,19 +475,19 @@ OaksPkmnTalk9:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wOaksPkmnTalkSegmentCounter]
+	ld a, [wOaksPKMNTalkSegmentCounter]
 	dec a
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	ld a, OAKS_POKEMON_TALK_4
 	jr nz, .ok
 	ld a, 5
-	ld [wOaksPkmnTalkSegmentCounter], a
+	ld [wOaksPKMNTalkSegmentCounter], a
 	ld a, OAKS_POKEMON_TALK_10
 .ok
 	jp NextRadioLine
 
 .Adjectives:
-; there are NUM_OAKS_MON_TALK_ADJECTIVES entries
+; there are NUM_OAKS_POKEMON_TALK_ADJECTIVES entries
 	dw .cute
 	dw .weird
 	dw .pleasant
@@ -585,7 +585,7 @@ OaksPkmnTalk9:
 	text_jump OPT_Speedy
 	db "@"
 
-OaksPkmnTalk10:
+OaksPKMNTalk10:
 	farcall RadioMusicRestartPokemonChannel
 	ld hl, OPT_RestartText
 	call PrintText
@@ -606,7 +606,7 @@ OPT_PokemonChannelText:
 OPT_RestartText:
 	db "@"
 
-OaksPkmnTalk11:
+OaksPKMNTalk11:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -618,7 +618,7 @@ OaksPkmnTalk11:
 .pokemon_string
 	db "#MON@"
 
-OaksPkmnTalk12:
+OaksPKMNTalk12:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -630,7 +630,7 @@ OaksPkmnTalk12:
 .pokemon_channel_string
 	db "#MON Channel@"
 
-OaksPkmnTalk13:
+OaksPKMNTalk13:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz
@@ -642,7 +642,7 @@ OaksPkmnTalk13:
 .terminator
 	db "@"
 
-OaksPkmnTalk14:
+OaksPKMNTalk14:
 	ld hl, wRadioTextDelay
 	dec [hl]
 	ret nz