Merge pull request #509 from mid-kid/master

A fix-various-little-things PR

9 files changed, 32 insertions, 32 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index ce5088fc2..3055f4e90 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6451,7 +6451,7 @@ LoadEnemyMon: ; 3e8eb
 
 .InitRoamHP:
 ; HP only uses the lo byte in the RoamMon struct since
-; Raikou/Entei/Suicune will have < 256 hp at level 40
+; Raikou and Entei will have < 256 hp at level 40
 	ld a, [wEnemyMonHP + 1]
 	ld [hl], a
 	jr .Moves
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index 85d6e7dc5..6e873a7c7 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -240,7 +240,7 @@ SmashRockScript:
 PokecenterSignScript:
 	farjumptext PokecenterSignText
 
-MartSignScript
+MartSignScript:
 	farjumptext MartSignText
 
 DayToTextScript:
@@ -331,30 +331,30 @@ BugContestResultsScript:
 	verbosegiveitem BERRY
 	iffalse BugContestResults_NoRoomForBerry
 
-BugContestResults_DidNotWin
+BugContestResults_DidNotWin:
 	farwritetext ContestResults_DidNotWinText
 	buttonsound
 	jump BugContestResults_FinishUp
 ; 0xbc2b1
 
-BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1
+BugContestResults_ReturnAfterWinnersPrize: ; 0xbc2b1
 	farwritetext ContestResults_JoinUsNextTimeText
 	buttonsound
 
-BugContestResults_FinishUp
+BugContestResults_FinishUp:
 	checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	iffalse BugContestResults_DidNotLeaveMons
 	farwritetext ContestResults_ReturnPartyText
 	waitbutton
 	special ContestReturnMons
-BugContestResults_DidNotLeaveMons
+BugContestResults_DidNotLeaveMons:
 	special CheckPartyFullAfterContest
 	ifequal BUGCONTEST_CAUGHT_MON, BugContestResults_CleanUp
 	ifequal BUGCONTEST_NO_CATCH, BugContestResults_CleanUp
 	; BUGCONTEST_BOXED_MON
 	farwritetext ContestResults_PartyFullText
 	waitbutton
-BugContestResults_CleanUp
+BugContestResults_CleanUp:
 	closetext
 	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
 	setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
@@ -383,7 +383,7 @@ BugContestResults_CleanUp
 	end
 ; 0xbc31e
 
-BugContestResults_FirstPlace ; 0xbc31e
+BugContestResults_FirstPlace: ; 0xbc31e
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	itemtotext SUN_STONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
@@ -393,7 +393,7 @@ BugContestResults_FirstPlace ; 0xbc31e
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc332
 
-BugContestResults_SecondPlace ; 0xbc332
+BugContestResults_SecondPlace: ; 0xbc332
 	itemtotext EVERSTONE, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
@@ -402,7 +402,7 @@ BugContestResults_SecondPlace ; 0xbc332
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc343
 
-BugContestResults_ThirdPlace ; 0xbc343
+BugContestResults_ThirdPlace: ; 0xbc343
 	itemtotext GOLD_BERRY, MEM_BUFFER_1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	waitbutton
@@ -411,35 +411,35 @@ BugContestResults_ThirdPlace ; 0xbc343
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc354
 
-BugContestResults_NoRoomForSunStone ; 0xbc354
+BugContestResults_NoRoomForSunStone: ; 0xbc354
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc35f
 
-BugContestResults_NoRoomForEverstone ; 0xbc35f
+BugContestResults_NoRoomForEverstone: ; 0xbc35f
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc36a
 
-BugContestResults_NoRoomForGoldBerry ; 0xbc36a
+BugContestResults_NoRoomForGoldBerry: ; 0xbc36a
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
 	jump BugContestResults_ReturnAfterWinnersPrize
 ; 0xbc375
 
-BugContestResults_NoRoomForBerry ; 0xbc375
+BugContestResults_NoRoomForBerry: ; 0xbc375
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	jump BugContestResults_DidNotWin
 ; 0xbc380
 
-BugContestResults_CopyContestantsToResults ; 0xbc380
+BugContestResults_CopyContestantsToResults: ; 0xbc380
 	checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
 	iftrue .skip1
 	clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index 8d6f4082f..1573a27b5 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -163,12 +163,12 @@ Function4440: ; 4440
 	add hl, bc
 	bit INVISIBLE, [hl]
 	jr nz, SetFacingStanding
-asm_4448
+asm_4448:
 	ld de, ObjectActionPairPointers + 2 ; use second column
 	jr _HandleObjectAction
 ; 444d
 
-_HandleObjectAction
+_HandleObjectAction:
 ; call [4 * wObjectStructs[ObjInd, OBJECT_ACTION] + de]
 	ld hl, OBJECT_ACTION
 	add hl, bc
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 9aaf98f39..a18be2e6c 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -112,8 +112,8 @@ ScriptCommandTable:
 	dw Script_checkpoke                  ; 2c
 	dw Script_givepoke                   ; 2d
 	dw Script_giveegg                    ; 2e
-	dw Script_givepokeitem               ; 2f
-	dw Script_checkpokeitem              ; 30
+	dw Script_givepokemail               ; 2f
+	dw Script_checkpokemail              ; 30
 	dw Script_checkevent                 ; 31
 	dw Script_clearevent                 ; 32
 	dw Script_setevent                   ; 33
@@ -2019,7 +2019,7 @@ Script_stringtotext:
 	ld de, wStringBuffer2
 	jp ConvertMemToText
 
-Script_givepokeitem:
+Script_givepokemail:
 ; script command 0x2f
 ; parameters: pointer
 
@@ -2037,10 +2037,10 @@ Script_givepokeitem:
 	ld a, [wScriptBank]
 	call FarCopyBytes
 	pop bc
-	farcall GivePokeItem
+	farcall GivePokeMail
 	ret
 
-Script_checkpokeitem:
+Script_checkpokemail:
 ; script command 0x30
 ; parameters: pointer
 
@@ -2050,7 +2050,7 @@ Script_checkpokeitem:
 	ld d, a
 	ld a, [wScriptBank]
 	ld b, a
-	farcall CheckPokeItem
+	farcall CheckPokeMail
 	ret
 
 Script_giveitem:
diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm
index 494e8d2a4..20375ba6c 100644
--- a/engine/overworld/wildmons.asm
+++ b/engine/overworld/wildmons.asm
@@ -417,7 +417,7 @@ _WaterWildmonLookup: ; 2a21d
 	ld bc, WATER_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
-_JohtoWildmonCheck
+_JohtoWildmonCheck:
 	call IsInJohto
 	and a
 	ret z
@@ -425,7 +425,7 @@ _JohtoWildmonCheck
 	ld l, e
 	ret
 
-_SwarmWildmonCheck
+_SwarmWildmonCheck:
 	call CopyCurrMapDE
 	push hl
 	ld hl, wSwarmFlags
@@ -460,11 +460,11 @@ _SwarmWildmonCheck
 	scf
 	ret
 
-_NoSwarmWildmon
+_NoSwarmWildmon:
 	and a
 	ret
 
-_NormalWildmonOK
+_NormalWildmonOK:
 	call CopyCurrMapDE
 	jr LookUpWildmonsForMapDE
 ; 2a27f
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 633096cd9..41f7bf47f 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -604,7 +604,7 @@ Phone_StartRinging: ; 9033f
 HangUp_Wait20Frames: ; 90355
 	jr Phone_Wait20Frames
 
-Phone_Wait20Frames
+Phone_Wait20Frames:
 	ld c, 20
 	call DelayFrames
 	farcall PhoneRing_CopyTilemapAtOnce
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index 58b42953c..e32d1a3a6 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -24,7 +24,7 @@ CheckBreedmonCompatibility: ; 16e1d
 	ld [wTempMonDVs], a
 	ld a, [wBreedMon2DVs + 1]
 	ld [wTempMonDVs + 1], a
-	ld a, $3
+	ld a, TEMPMON
 	ld [wMonType], a
 	predef GetGender
 	pop bc
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index 5a7e75dfa..291bd79b0 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -18,7 +18,7 @@ EvolveAfterBattle: ; 421e6
 
 	push hl
 
-EvolveAfterBattle_MasterLoop
+EvolveAfterBattle_MasterLoop:
 	ld hl, wCurPartyMon
 	inc [hl]
 
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index b8685c0df..33bce604d 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
 	jp CloseSRAM
 ; 44654
 
-CheckPokeItem:: ; 44654
+CheckPokeMail:: ; 44654
 	push bc
 	push de
 	farcall SelectMonFromParty
@@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
 ; 446cc
 
 
-GivePokeItem:: ; 446cc
+GivePokeMail:: ; 446cc
 	ld a, [wPartyCount]
 	dec a
 	push af