Merge pull request #477 from mid-kid/master

Medium-sized cleanups

Makefile

@@ -235,8 +235,6 @@ gfx/unknown/unknown_egg.2bpp: rgbgfx += -h
 	$(if $(tools/gfx),\
 		tools/gfx $(tools/gfx) -d1 -o $@ $@)
 
-%.tilemap: %.png
-	$(RGBGFX) -t $@ $<
 %.gbcpal: %.png
 	$(RGBGFX) -p $@ $<
 %.dimensions: %.png

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

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_POKEMON_TALK_ADVERBS    EQU 16 ; OaksPKMNTalk8.Adverbs
-NUM_OAKS_MON_TALK_ADJECTIVES EQU 16 ; OaksPkmnTalk9.Adjectives
+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
 

constants/wram_constants.asm

@@ -128,6 +128,8 @@ SPAWN_RED   EQU 2
 ; wPokemonWithdrawDepositParameter
 PC_WITHDRAW       EQU 0
 PC_DEPOSIT        EQU 1
+REMOVE_PARTY      EQU 0
+REMOVE_BOX        EQU 1
 DAY_CARE_WITHDRAW EQU 2
 DAY_CARE_DEPOSIT  EQU 3
 

data/battle/battle_text.asm

@@ -137,14 +137,14 @@ BattleText_SafeguardFaded: ; 0x808d2
 	prompt
 ; 0x808e7
 
-BattleText_PkmnLightScreenFell: ; 0x808e7
+BattleText_MonsLightScreenFell: ; 0x808e7
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "LIGHT SCREEN fell!"
 	prompt
 ; 0x80905
 
-BattleText_PkmnReflectFaded: ; 0x80905
+BattleText_MonsReflectFaded: ; 0x80905
 	text_from_ram wStringBuffer1
 	text " #MON's"
 	line "REFLECT faded!"
@@ -186,7 +186,7 @@ BattleText_TheSandstormSubsided: ; 0x8098f
 	prompt
 ; 0x809a8
 
-BattleText_EnemyPkmnFainted: ; 0x809a8
+BattleText_EnemyMonFainted: ; 0x809a8
 	text "Enemy @"
 	text_from_ram wEnemyMonNick
 	text_start
@@ -236,7 +236,7 @@ BattleText_0x80a4f: ; 0x80a4f
 	prompt
 ; 0x80a75
 
-BattleText_PkmnFainted: ; 0x80a75
+BattleText_MonFainted: ; 0x80a75
 	text_from_ram wBattleMonNick
 	text_start
 	line "fainted!"
@@ -261,7 +261,7 @@ LostAgainstText: ; 0x80ab9
 	prompt
 ; 0x80aca
 
-BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca
+BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
@@ -353,14 +353,14 @@ BattleText_ItemsCantBeUsedHere: ; 0x80bf3
 	prompt
 ; 0x80c0d
 
-BattleText_PkmnIsAlreadyOut: ; 0x80c0d
+BattleText_MonIsAlreadyOut: ; 0x80c0d
 	text_from_ram wBattleMonNick
 	text_start
 	line "is already out."
 	prompt
 ; 0x80c22
 
-BattleText_PkmnCantBeRecalled: ; 0x80c22
+BattleText_MonCantBeRecalled: ; 0x80c22
 	text_from_ram wBattleMonNick
 	text_start
 	line "can't be recalled!"
@@ -379,7 +379,7 @@ BattleText_TheMoveIsDisabled: ; 0x80c5b
 	prompt
 ; 0x80c72
 
-BattleText_PkmnHasNoMovesLeft: ; 0x80c72
+BattleText_MonHasNoMovesLeft: ; 0x80c72
 	text_from_ram wBattleMonNick
 	text_start
 	line "has no moves left!"
@@ -402,7 +402,7 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
 	db "@@"
 ; 0x80cb9
 
-BattleText_WildPkmnIsEating: ; 0x80cba
+BattleText_WildMonIsEating: ; 0x80cba
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start
@@ -410,7 +410,7 @@ BattleText_WildPkmnIsEating: ; 0x80cba
 	prompt
 ; 0x80cd1
 
-BattleText_WildPkmnIsAngry: ; 0x80cd1
+BattleText_WildMonIsAngry: ; 0x80cd1
 	text "Wild @"
 	text_from_ram wEnemyMonNick
 	text_start

data/common_text/common_text_1.asm

@@ -1121,7 +1121,7 @@ Text_RemainingTime::
 	text "Remaining Time"
 	done
 
-Text_YourPkmnsHPWasHealed::
+Text_YourMonsHPWasHealed::
 	text "Your #MON's HP"
 	line "was healed."
 	prompt

data/common_text/common_text_2.asm

@@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints::
 	text " EXP. Points!"
 	prompt
 
-Text_GoPkmn::
+Text_GoMon::
 	text "Go! @@"
 
-Text_DoItPkmn::
+Text_DoItMon::
 	text "Do it! @@"
 
-Text_GoForItPkmn::
+Text_GoForItMon::
 	text "Go for it,"
 	line "@@"
 
-Text_YourFoesWeakGetmPkmn::
+Text_YourFoesWeakGetmMon::
 	text "Your foe's weak!"
 	line "Get'm, @@"
 
@@ -618,7 +618,7 @@ UnknownText_0x1c0bee::
 	cont "time to use that!"
 	prompt
 
-Text_YouDontHaveAPkmn::
+Text_YouDontHaveAMon::
 	text "You don't have a"
 	line "#MON!"
 	prompt

data/common_text/common_text_3.asm

@@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3::
 	para ""
 	done
 
-Text_OnlyThreePkmnMayBeEntered::
+Text_OnlyThreeMonMayBeEntered::
 	text "Only three #MON"
 	line "may be entered."
 
 	para ""
 	done
 
-Text_ThePkmnMustAllBeDifferentKinds::
+Text_TheMonMustAllBeDifferentKinds::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"
@@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds::
 	para ""
 	done
 
-Text_ThePkmnMustNotHoldTheSameItems::
+Text_TheMonMustNotHoldTheSameItems::
 	text "The @"
 	text_from_ram wStringBuffer2
 	text " #MON"

data/predef_pointers.asm

@@ -15,19 +15,19 @@ PredefPointers:: ; 856b
 	add_predef FillPP
 	add_predef TryAddMonToParty
 	add_predef AddTempmonToParty
-	add_predef SendGetPkmnIntoFromBox
+	add_predef SendGetMonIntoFromBox
-	add_predef SendPkmnIntoBox
+	add_predef SendMonIntoBox
 	add_predef GiveEgg
 	add_predef AnimateHPBar
-	add_predef CalcPkmnStats
+	add_predef CalcMonStats
-	add_predef CalcPkmnStatC
+	add_predef CalcMonStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
 	add_predef LinkTextboxAtHL ; $ 10
 	add_predef PrintMoveDesc
 	add_predef UpdatePlayerHUD
 	add_predef PlaceGraphic
-	add_predef CheckPlayerPartyForFitPkmn
+	add_predef CheckPlayerPartyForFitMon
 	add_predef UpdateEnemyHUD
 	add_predef StartBattle
 	add_predef FillInExpBar
@@ -38,7 +38,7 @@ PredefPointers:: ; 856b
 	add_predef EvolveAfterBattle
 	add_predef TradeAnimationPlayer2
 	add_predef TradeAnimation
-	add_predef CopyPkmnToTempMon
+	add_predef CopyMonToTempMon
 	add_predef ListMoves ; $20
 	add_predef PlaceNonFaintStatus
 	add_predef Unused_PlaceEnemyHPLevel

data/radio/oaks_pkmn_talk_routes.asm

@@ -1,6 +1,6 @@
 ; Oak's Pokémon Talk will list wild Pokémon on these maps.
 
-OaksPkmnTalkRoutes:
+OaksPKMNTalkRoutes:
 	map ROUTE_29
 	map ROUTE_46
 	map ROUTE_30
@@ -16,4 +16,4 @@ OaksPkmnTalkRoutes:
 	map ROUTE_45
 	map ROUTE_36
 	map ROUTE_31
-OaksPkmnTalkRoutesEnd
+OaksPKMNTalkRoutesEnd

data/radio/pnp_hidden_places.asm

@@ -10,4 +10,4 @@ PnP_HiddenPlaces:
 	map ROUTE_16
 	map ROUTE_14
 	map CINNABAR_POKECENTER_2F_BETA
-PnP_HiddenPlacesEnd
+PnP_HiddenPlacesEnd:

docs/bugs_and_glitches.md

@@ -261,7 +261,7 @@ This is a bug with `CheckPlayerHasUsableMoves` in [engine/battle/core.asm](/engi
 	ret nz
 
 .force_struggle
-	ld hl, BattleText_PkmnHasNoMovesLeft
+	ld hl, BattleText_MonHasNoMovesLeft
 	call StdBattleTextBox
 	ld c, 60
 	call DelayFrames

engine/battle/ai/items.asm

@@ -74,7 +74,7 @@ SwitchOften: ; 38045
 	ld a, [wEnemySwitchMonParam]
 	and $f
 	inc a
-	; In register 'a' is the number (1-6) of the Pkmn to switch to
+	; In register 'a' is the number (1-6) of the mon to switch to
 	ld [wEnemySwitchMonIndex], a
 	jp AI_TrySwitch
 ; 38083

engine/battle/core.asm

@@ -47,7 +47,7 @@ DoBattle: ; 3c000
 
 .player_2
 	call LoadTileMapToTempTileMap
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -86,7 +86,7 @@ DoBattle: ; 3c000
 	call ResetBattleParticipants
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -1697,7 +1697,7 @@ HandleScreens: ; 3cb36
 	res SCREENS_LIGHT_SCREEN, [hl]
 	push hl
 	push de
-	ld hl, BattleText_PkmnLightScreenFell
+	ld hl, BattleText_MonsLightScreenFell
 	call StdBattleTextBox
 	pop de
 	pop hl
@@ -1711,7 +1711,7 @@ HandleScreens: ; 3cb36
 	ld [de], a
 	ret nz
 	res SCREENS_REFLECT, [hl]
-	ld hl, BattleText_PkmnReflectFaded
+	ld hl, BattleText_MonsReflectFaded
 	jp StdBattleTextBox
 ; 3cb9e
 
@@ -1822,7 +1822,7 @@ SubtractHPFromTarget: ; 3cc39
 ; 3cc3f
 
 SubtractHPFromUser: ; 3cc3f
-; Subtract HP from Pkmn
+; Subtract HP from mon
 	call SubtractHP
 	jp UpdateHPBarBattleHuds
 ; 3cc45
@@ -2054,7 +2054,7 @@ HandleEnemyMonFaint: ; 3cd55
 	xor a
 	ld [wWhichMonFaintedFirst], a
 	call UpdateBattleStateAndExperienceAfterEnemyFaint
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -2186,7 +2186,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01
 	call PlayerMonFaintHappinessMod
 
 .player_mon_did_not_faint
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	ret z
@@ -2308,7 +2308,7 @@ FaintYourPokemon: ; 3cef1
 	hlcoord 9, 7
 	lb bc, 5, 11
 	call ClearBox
-	ld hl, BattleText_PkmnFainted
+	ld hl, BattleText_MonFainted
 	jp StdBattleTextBox
 ; 3cf14
 
@@ -2322,7 +2322,7 @@ FaintEnemyPokemon: ; 3cf14
 	hlcoord 1, 0
 	lb bc, 4, 10
 	call ClearBox
-	ld hl, BattleText_EnemyPkmnFainted
+	ld hl, BattleText_EnemyMonFainted
 	jp StdBattleTextBox
 ; 3cf35
 
@@ -2670,7 +2670,7 @@ HandlePlayerMonFaint: ; 3d14e
 	ld a, $1
 	ld [wWhichMonFaintedFirst], a
 	call PlayerMonFaintHappinessMod
-	call CheckPlayerPartyForFitPkmn
+	call CheckPlayerPartyForFitMon
 	ld a, d
 	and a
 	jp z, LostBattle
@@ -2829,7 +2829,7 @@ ForcePlayerMonChoice: ; 3d227
 	call CloseWindow
 	call GetMemSGBLayout
 	call SetPalettes
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -2851,7 +2851,7 @@ PlayerPartyMonEntrance: ; 3d2b3
 	call AddBattleParticipant
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -2934,7 +2934,7 @@ SwitchMonAlreadyOut: ; 3d34f
 	cp [hl]
 	jr nz, .notout
 
-	ld hl, BattleText_PkmnIsAlreadyOut
+	ld hl, BattleText_MonIsAlreadyOut
 	call StdBattleTextBox
 	scf
 	ret
@@ -3197,11 +3197,11 @@ ForceEnemySwitch: ; 3d4c3
 	ld a, [wEnemySwitchMonIndex]
 	dec a
 	ld b, a
-	call LoadEnemyPkmnToSwitchTo
+	call LoadEnemyMonToSwitchTo
 	call ClearEnemyMonBox
 	call NewEnemyMonStatus
 	call ResetEnemyStatLevels
-	call Function_SetEnemyPkmnAndSendOutAnimation
+	call Function_SetEnemyMonAndSendOutAnimation
 	call BreakAttraction
 	call ResetBattleParticipants
 	ret
@@ -3214,15 +3214,15 @@ EnemySwitch: ; 3d4e1
 	call ResetEnemyBattleVars
 	call CheckWhetherSwitchmonIsPredetermined
 	jr c, .skip
-	call FindPkmnInOTPartyToSwitchIntoBattle
+	call FindMonInOTPartyToSwitchIntoBattle
 .skip
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
+	; 'b' contains the PartyNr of the mon the AI will switch to
-	call LoadEnemyPkmnToSwitchTo
+	call LoadEnemyMonToSwitchTo
 	call OfferSwitch
 	push af
 	call ClearEnemyMonBox
 	call Function_BattleTextEnemySentOut
-	call Function_SetEnemyPkmnAndSendOutAnimation
+	call Function_SetEnemyMonAndSendOutAnimation
 	pop af
 	ret c
 	; If we're here, then we're switching too
@@ -3240,15 +3240,15 @@ EnemySwitch_SetMode: ; 3d517
 	call ResetEnemyBattleVars
 	call CheckWhetherSwitchmonIsPredetermined
 	jr c, .skip
-	call FindPkmnInOTPartyToSwitchIntoBattle
+	call FindMonInOTPartyToSwitchIntoBattle
 .skip
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
+	; 'b' contains the PartyNr of the mon the AI will switch to
-	call LoadEnemyPkmnToSwitchTo
+	call LoadEnemyMonToSwitchTo
 	ld a, 1
 	ld [wEnemyIsSwitching], a
 	call ClearEnemyMonBox
 	call Function_BattleTextEnemySentOut
-	jp Function_SetEnemyPkmnAndSendOutAnimation
+	jp Function_SetEnemyMonAndSendOutAnimation
 ; 3d533
 
 CheckWhetherSwitchmonIsPredetermined: ; 3d533
@@ -3319,7 +3319,7 @@ AddBattleParticipant: ; 3d581
 	predef_jump SmallFarFlagAction
 ; 3d599
 
-FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
+FindMonInOTPartyToSwitchIntoBattle: ; 3d599
 	ld b, $ff
 	ld a, $1
 	ld [wBuffer1], a
@@ -3347,7 +3347,7 @@ FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
 	pop bc
 	jr z, .discourage
 	call LookUpTheEffectivenessOfEveryMove
-	call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn
+	call IsThePlayerMonTypesEffectiveAgainstOTMon
 	jr .loop
 
 .discourage
@@ -3394,9 +3394,9 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
 	ret
 ; 3d618
 
-IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
+IsThePlayerMonTypesEffectiveAgainstOTMon: ; 3d618
-; Calculates the effectiveness of the types of the PlayerPkmn
+; Calculates the effectiveness of the types of the PlayerMon
-; against the OTPkmn
+; against the OTMon
 	push bc
 	ld hl, wOTPartyCount
 	ld a, b
@@ -3508,8 +3508,8 @@ ScoreMonTypeMatchups: ; 3d672
 	ret
 ; 3d6ca
 
-LoadEnemyPkmnToSwitchTo: ; 3d6ca
+LoadEnemyMonToSwitchTo: ; 3d6ca
-	; 'b' contains the PartyNr of the Pkmn the AI will switch to
+	; 'b' contains the PartyNr of the mon the AI will switch to
 	ld a, b
 	ld [wCurPartyMon], a
 	ld hl, wOTPartyMon1Level
@@ -3581,7 +3581,7 @@ OfferSwitch: ; 3d74b
 	ld a, [wCurPartyMon]
 	push af
 	callfar Battle_GetTrainerName
-	ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn
+	ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangeMon
 	call StdBattleTextBox
 	lb bc, 1, 7
 	call PlaceYesNoBox
@@ -3637,14 +3637,14 @@ Function_BattleTextEnemySentOut: ; 3d7b8
 	jp WaitBGMap
 ; 3d7c7
 
-Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
+Function_SetEnemyMonAndSendOutAnimation: ; 3d7c7
 	ld a, [wTempEnemyMonSpecies]
 	ld [wCurPartySpecies], a
 	ld [wCurSpecies], a
 	call GetBaseData
 	ld a, OTPARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	call GetEnemyMonFrontpic
 
 	xor a
@@ -3721,8 +3721,8 @@ ResetEnemyStatLevels: ; 3d867
 	ret
 ; 3d873
 
-CheckPlayerPartyForFitPkmn: ; 3d873
+CheckPlayerPartyForFitMon: ; 3d873
-; Has the player any Pkmn in his Party that can fight?
+; Has the player any mon in his Party that can fight?
 	ld a, [wPartyCount]
 	ld e, a
 	xor a
@@ -4308,7 +4308,7 @@ PursuitSwitch: ; 3dc5b
 	ld b, RESET_FLAG
 	predef SmallFarFlagAction
 	call PlayerMonFaintedAnimation
-	ld hl, BattleText_PkmnFainted
+	ld hl, BattleText_MonFainted
 	jr .done_fainted
 
 .check_enemy_fainted
@@ -4324,7 +4324,7 @@ PursuitSwitch: ; 3dc5b
 	call PlaySFX
 	call WaitSFX
 	call EnemyMonFaintedAnimation
-	ld hl, BattleText_EnemyPkmnFainted
+	ld hl, BattleText_EnemyMonFainted
 
 .done_fainted
 	call StdBattleTextBox
@@ -5306,7 +5306,7 @@ TryPlayerSwitch: ; 3e358
 	ld a, [wCurPartyMon]
 	cp d
 	jr nz, .check_trapped
-	ld hl, BattleText_PkmnIsAlreadyOut
+	ld hl, BattleText_MonIsAlreadyOut
 	call StdBattleTextBox
 	jp BattleMenuPKMN_Loop
 
@@ -5319,7 +5319,7 @@ TryPlayerSwitch: ; 3e358
 	jr z, .try_switch
 
 .trapped
-	ld hl, BattleText_PkmnCantBeRecalled
+	ld hl, BattleText_MonCantBeRecalled
 	call StdBattleTextBox
 	jp BattleMenuPKMN_Loop
 
@@ -5396,7 +5396,7 @@ EnemyMonEntrance: ; 3e3ff
 ; 3e40b
 
 BattleMonEntrance: ; 3e40b
-	call WithdrawPkmnText
+	call WithdrawMonText
 
 	ld c, 50
 	call DelayFrames
@@ -5419,7 +5419,7 @@ BattleMonEntrance: ; 3e40b
 	call AddBattleParticipant
 	call InitBattleMon
 	call ResetPlayerStatLevels
-	call SendOutPkmnText
+	call SendOutMonText
 	call NewBattleMonStatus
 	call BreakAttraction
 	call SendOutPlayerMon
@@ -5938,7 +5938,7 @@ CheckPlayerHasUsableMoves: ; 3e786
 	ret nz
 
 .force_struggle
-	ld hl, BattleText_PkmnHasNoMovesLeft
+	ld hl, BattleText_MonHasNoMovesLeft
 	call StdBattleTextBox
 	ld c, 60
 	call DelayFrames
@@ -6408,7 +6408,7 @@ LoadEnemyMon: ; 3e8eb
 	ld de, wEnemyMonMaxHP
 	ld b, FALSE
 	ld hl, wEnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; wLinkBattleRNs + 7 ; ?
-	predef CalcPkmnStats
+	predef CalcMonStats
 
 ; If we're in a trainer battle,
 ; get the rest of the parameters from the party struct
@@ -7350,7 +7350,7 @@ GiveExperiencePoints: ; 3ee3b
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 	call GetNick
-	ld hl, Text_PkmnGainedExpPoint
+	ld hl, Text_MonGainedExpPoint
 	call BattleTextBox
 	ld a, [wStringBuffer2 + 1]
 	ld [hQuotient + 2], a
@@ -7419,7 +7419,7 @@ GiveExperiencePoints: ; 3ee3b
 .not_max_exp
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	callfar CalcLevel
 	pop bc
 	ld hl, MON_LEVEL
@@ -7456,7 +7456,7 @@ GiveExperiencePoints: ; 3ee3b
 	add hl, bc
 	push bc
 	ld b, TRUE
-	predef CalcPkmnStats
+	predef CalcMonStats
 	pop bc
 	pop de
 	ld hl, MON_MAXHP + 1
@@ -7532,7 +7532,7 @@ GiveExperiencePoints: ; 3ee3b
 .skip_animation2
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	hlcoord 9, 0
 	ld b, $a
 	ld c, $9
@@ -7648,7 +7648,7 @@ BoostExp: ; 3f106
 	ret
 ; 3f11b
 
-Text_PkmnGainedExpPoint: ; 3f11b
+Text_MonGainedExpPoint: ; 3f11b
 	text_jump Text_Gained
 	start_asm
 	ld hl, TextJump_StringBuffer2ExpPoints
@@ -7692,7 +7692,7 @@ AnimateExpBar: ; 3f136
 	ld [wd002], a
 	xor a ; PARTYMON
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	ld a, [wTempMonLevel]
 	ld b, a
 	ld e, a
@@ -7856,23 +7856,23 @@ AnimateExpBar: ; 3f136
 	ld [hBGMapMode], a
 	ret
 
-SendOutPkmnText: ; 3f26d
+SendOutMonText: ; 3f26d
 	ld a, [wLinkMode]
 	and a
 	jr z, .not_linked
 
-	ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>"
+	ld hl, JumpText_GoMon ; If we're in a LinkBattle print just "Go <PlayerMon>"
 
 	ld a, [wBattleHasJustStarted] ; unless this (unidentified) variable is set
 	and a
 	jr nz, .skip_to_textbox
 
 .not_linked
-; Depending on the HP of the enemy Pkmn, the game prints a different text
+; Depending on the HP of the enemy mon, the game prints a different text
 	ld hl, wEnemyMonHP
 	ld a, [hli]
 	or [hl]
-	ld hl, JumpText_GoPkmn
+	ld hl, JumpText_GoMon
 	jr z, .skip_to_textbox
 
 	; compute enemy helth remaining as a percentage
@@ -7901,43 +7901,43 @@ SendOutPkmnText: ; 3f26d
 	call Divide
 
 	ld a, [hQuotient + 2]
-	ld hl, JumpText_GoPkmn
+	ld hl, JumpText_GoMon
 	cp 70
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_DoItPkmn
+	ld hl, JumpText_DoItMon
 	cp 40
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_GoForItPkmn
+	ld hl, JumpText_GoForItMon
 	cp 10
 	jr nc, .skip_to_textbox
 
-	ld hl, JumpText_YourFoesWeakGetmPkmn
+	ld hl, JumpText_YourFoesWeakGetmMon
 .skip_to_textbox
 	jp BattleTextBox
 ; 3f2d1
 
-JumpText_GoPkmn: ; 3f2d1
+JumpText_GoMon: ; 3f2d1
-	text_jump Text_GoPkmn
+	text_jump Text_GoMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
 ; 3f2d6
 
-JumpText_DoItPkmn: ; 3f2d8
+JumpText_DoItMon: ; 3f2d8
-	text_jump Text_DoItPkmn
+	text_jump Text_DoItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
 ; 3f2dd
 
-JumpText_GoForItPkmn: ; 3f2df
+JumpText_GoForItMon: ; 3f2df
-	text_jump Text_GoForItPkmn
+	text_jump Text_GoForItMon
 	start_asm
 	jr Function_TextJump_BattleMonNick01
 ; 3f2e4
 
-JumpText_YourFoesWeakGetmPkmn: ; 3f2e6
+JumpText_YourFoesWeakGetmMon: ; 3f2e6
-	text_jump Text_YourFoesWeakGetmPkmn
+	text_jump Text_YourFoesWeakGetmMon
 	start_asm
 Function_TextJump_BattleMonNick01: ; 3f2eb
 	ld hl, TextJump_BattleMonNick01
@@ -7949,14 +7949,14 @@ TextJump_BattleMonNick01: ; 3f2ef
 	db "@"
 ; 3f2f4
 
-WithdrawPkmnText: ; 3f2f4
+WithdrawMonText: ; 3f2f4
-	ld hl, .WithdrawPkmnText
+	ld hl, .WithdrawMonText
 	jp BattleTextBox
 
-.WithdrawPkmnText:
+.WithdrawMonText:
 	text_jump Text_BattleMonNickComma
 	start_asm
-; Print text to withdraw Pkmn
+; Print text to withdraw mon
 ; depending on HP the message is different
 	push de
 	push bc
@@ -8037,7 +8037,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
 	and a
 	jr z, .angry
 	dec [hl]
-	ld hl, BattleText_WildPkmnIsEating
+	ld hl, BattleText_WildMonIsEating
 	jr .finish
 
 .angry
@@ -8046,7 +8046,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
 	and a
 	ret z
 	dec [hl]
-	ld hl, BattleText_WildPkmnIsAngry
+	ld hl, BattleText_WildMonIsAngry
 	jr nz, .finish
 	push hl
 	ld a, [wEnemyMonSpecies]

engine/billspc.asm

@@ -203,7 +203,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -463,7 +463,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -591,7 +591,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button
-	call MovePkmnWithoutMail_DPad
+	call MoveMonWithoutMail_DPad
 	jr c, .d_pad
 	and a
 	ret z
@@ -750,7 +750,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button_2
-	call MovePkmnWithoutMail_DPad_2
+	call MoveMonWithoutMail_DPad_2
 	jr c, .dpad_2
 	and a
 	ret z
@@ -862,7 +862,7 @@ Withdraw_UpDown: ; e29b5 (38:69b5)
 	jp BillsPC_JoypadDidNothing
 ; e29d0 (38:69d0)
 
-MovePkmnWithoutMail_DPad: ; e29d0
+MoveMonWithoutMail_DPad: ; e29d0
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -886,7 +886,7 @@ MovePkmnWithoutMail_DPad: ; e29d0
 	jr nz, BillsPC_PressRight
 	jr BillsPC_JoypadDidNothing
 
-MovePkmnWithoutMail_DPad_2: ; e29f4
+MoveMonWithoutMail_DPad_2: ; e29f4
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -1763,7 +1763,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	call CloseSRAM
-	farcall CalcwBufferMonStats
+	farcall CalcBufferMonStats
 	ret
 
 .party
@@ -1806,7 +1806,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6)
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyMonToTemp
 	call CloseSRAM
-	farcall CalcwBufferMonStats
+	farcall CalcBufferMonStats
 	ret
 
 DepositPokemon: ; e307c (38:707c)
@@ -1819,9 +1819,9 @@ DepositPokemon: ; e307c (38:707c)
 	call GetNick
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .asm_boxisfull
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -1874,9 +1874,9 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	call CloseSRAM
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .PartyFull
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -2010,7 +2010,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 .dw_return ; e322a
 	pop af
 	ld e, a
-	farcall MovePkmnWOMail_InsertMon_SaveGame
+	farcall MoveMonWOMail_InsertMon_SaveGame
 	ret
 ; e3233
 
@@ -2095,7 +2095,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld a, [wBillsPC_BackupLoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_BackupCursorPosition]
 	ld hl, wBillsPC_BackupScrollPosition
 	add [hl]
@@ -2112,8 +2112,8 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyMonToTemp
 	call CloseSRAM
-	farcall CalcwBufferMonStats
+	farcall CalcBufferMonStats
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
@@ -2123,7 +2123,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld a, [wBillsPC_LoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -2146,7 +2146,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyMonToTemp
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret

engine/billspctop.asm

@@ -117,7 +117,7 @@ BillsPC_MovePKMNMenu: ; e4cd
 	jr .quit
 
 .no_mail
-	farcall StartMovePkmnWOMail_SaveGame
+	farcall StartMoveMonWOMail_SaveGame
 	jr c, .quit
 	farcall _MovePKMNWithoutMail
 	call ReturnToMapFromSubmenu
@@ -145,30 +145,30 @@ BillsPC_DepositMenu: ; e4fe (3:64fe)
 Unreferenced_Functione512:
 	ld a, [wPartyCount]
 	and a
-	jr z, .no_pkmn
+	jr z, .no_mon
 	cp 2
-	jr c, .only_one_pkmn
+	jr c, .only_one_mon
 	and a
 	ret
 
-.no_pkmn
+.no_mon
-	ld hl, .Text_NoPKMN
+	ld hl, .Text_NoMon
 	call MenuTextBoxBackup
 	scf
 	ret
 
-.only_one_pkmn
+.only_one_mon
-	ld hl, .Text_ItsYourLastPKMN
+	ld hl, .Text_ItsYourLastMon
 	call MenuTextBoxBackup
 	scf
 	ret
 
-.Text_NoPKMN: ; 0xe52e
+.Text_NoMon: ; 0xe52e
 	; You don't have a single #MON!
 	text_jump UnknownText_0x1c1062
 	db "@"
 
-.Text_ItsYourLastPKMN: ; 0xe533
+.Text_ItsYourLastMon: ; 0xe533
 	; You can't deposit your last #MON!
 	text_jump UnknownText_0x1c1080
 	db "@"

engine/breeding.asm

@@ -288,8 +288,8 @@ HatchEggs: ; 16f70 (5:6f70)
 	push hl
 	ld bc, MON_STAT_EXP - 1
 	add hl, bc
-	ld b, $0
+	ld b, FALSE
-	predef CalcPkmnStats
+	predef CalcMonStats
 	pop bc
 	ld hl, MON_MAXHP
 	add hl, bc