Events and some WRAM cleanup

17 files changed, 417 insertions, 393 deletions

diff --git a/event/buena.asm b/event/buena.asm
index 68df12dfa..082347ddf 100644
--- a/event/buena.asm
+++ b/event/buena.asm
@@ -1,6 +1,6 @@
 SpecialBuenasPassword: ; 8af6b
 	xor a
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	ld hl, .MenuDataHeader
 	call CopyMenuDataHeader
 	ld a, [wBuenasPassword]
@@ -69,8 +69,8 @@ SpecialBuenaPrize: ; 8afd4
 	ld [wMenuScrollPosition], a
 	ld a, $1
 	ld [MenuSelection], a
-	call Function8b0d6
-	call Function8b090
+	call Buena_PlacePrizeMenuBox
+	call Buena_DisplayBlueCardBalance
 	ld hl, .Text_AskWhichPrize
 	call PrintText
 	jr .okay
@@ -83,12 +83,12 @@ SpecialBuenaPrize: ; 8afd4
 	call DelayFrame
 	call UpdateSprites
 	call PrintBlueCardBalance
-	call Function8b0e2
+	call Buena_PrizeMenu
 	jr z, .done
 	ld [MenuSelectionQuantity], a
 	call Buena_getprize
 	ld a, [hl]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
 	ld hl, .Text_IsThatRight
 	call BuenaPrintText
@@ -183,7 +183,7 @@ SpecialBuenaPrize: ; 8afd4
 	db "@"
 ; 0x8b090
 
-Function8b090: ; 8b090
+Buena_DisplayBlueCardBalance: ; 8b090
 	ld hl, BlueCardBalanceMenuDataHeader
 	call LoadMenuDataHeader
 	ret
@@ -230,7 +230,7 @@ BlueCardBalanceMenuDataHeader: ; 0x8b0d1
 	db 13, 11 ; end coords
 ; 8b0d6
 
-Function8b0d6: ; 8b0d6
+Buena_PlacePrizeMenuBox: ; 8b0d6
 	ld hl, .menudataheader
 	call LoadMenuDataHeader
 	ret
@@ -242,13 +242,13 @@ Function8b0d6: ; 8b0d6
 	db 11, 17 ; end coords
 ; 8b0e2
 
-Function8b0e2: ; 8b0e2
+Buena_PrizeMenu: ; 8b0e2
 	ld hl, .MenuDataHeader
 	call CopyMenuDataHeader
 	ld a, [MenuSelection]
 	ld [wMenuCursorBuffer], a
 	xor a
-	ld [wcf76], a
+	ld [wWhichIndexSet], a
 	ld [hBGMapMode], a
 	call InitScrollingMenu
 	call UpdateSprites
diff --git a/event/bug_contest_2.asm b/event/bug_contest_2.asm
index 4aa4390eb..72fa8a31b 100755
--- a/event/bug_contest_2.asm
+++ b/event/bug_contest_2.asm
@@ -27,9 +27,9 @@ endr
 .next
 ; Choose a flag at uniform random to be set.
 	call Random
-	cp $fa ; 250
+	cp 250
 	jr nc, .next
-	ld c, $19 ; 25
+	ld c, 25
 	call SimpleDivide
 	ld e, b
 	ld d, 0
@@ -124,7 +124,7 @@ ContestReturnMons: ; 13a31
 	ld b, $1
 .loop
 	ld a, [hli]
-	cp $ff
+	cp -1
 	jr z, .done
 	inc b
 	jr .loop
diff --git a/event/bug_contest_judging.asm b/event/bug_contest_judging.asm
index 4180391e1..04a8ff8bb 100755
--- a/event/bug_contest_judging.asm
+++ b/event/bug_contest_judging.asm
@@ -1,7 +1,7 @@
 _BugContestJudging: ; 1369d
 	call ContestScore
 	callba MobileFn_105f79
-	call Function13819
+	call BugContest_JudgeContestants
 	ld a, [wBugContestThirdPlacePersonID]
 	call LoadContestantName
 	ld a, [wBugContestThirdPlaceMon]
@@ -23,13 +23,12 @@ _BugContestJudging: ; 1369d
 	call GetPokemonName
 	ld hl, BugContest_FirstPlaceText
 	call PrintText
-	jp Function13807
+	jp BugContest_GetPlayersResult
 ; 136eb
 
 BugContest_FirstPlaceText: ; 0x136eb
 	text_jump ContestJudging_FirstPlaceText
 	start_asm
-BugContest_FirstPlace: ; 136f0
 	ld de, SFX_1ST_PLACE
 	call PlaySFX
 	call WaitSFX
@@ -47,7 +46,6 @@ BugContest_SecondPlaceText: ; 0x13702
 	; Placing second was @ , who caught a @ !@ @
 	text_jump ContestJudging_SecondPlaceText
 	start_asm
-BugContest_SecondPlace: ; 13707
 	ld de, SFX_2ND_PLACE
 	call PlaySFX
 	call WaitSFX
@@ -215,13 +213,13 @@ BugContestant_SchoolboyKipp:
 	dbw KAKUNA,     259
 ; 13807
 
-Function13807: ; 13807
+BugContest_GetPlayersResult: ; 13807
 	ld hl, wBugContestThirdPlacePersonID
 	ld de, -4
 	ld b, 3
 .loop
 	ld a, [hl]
-	cp 1
+	cp 1 ; Player
 	jr z, .done
 	add hl, de
 	dec b
@@ -231,25 +229,25 @@ Function13807: ; 13807
 	ret
 ; 13819
 
-Function13819: ; 13819
+BugContest_JudgeContestants: ; 13819
 	call ClearContestResults
 	call ComputeAIContestantScores
 	ld hl, wBugContestTempPersonID
-	ld a, 1
+	ld a, 1 ; Player
 	ld [hli], a
 	ld a, [wContestMon]
 	ld [hli], a
 	ld a, [hProduct]
 	ld [hli], a
-	ld a, [hMultiplicand]
+	ld a, [hProduct + 1]
 	ld [hl], a
 	call DetermineContestWinners
 	ret
 ; 13833
 
 ClearContestResults: ; 13833
-	ld hl, wBugContestFirstPlacePersonID
-	ld b, 12
+	ld hl, wBugContestResults
+	ld b, wBugContestWinnersEnd - wBugContestResults
 	xor a
 .loop
 	ld [hli], a
diff --git a/event/card_key.asm b/event/card_key.asm
index 711d97725..dc4c73ad2 100755
--- a/event/card_key.asm
+++ b/event/card_key.asm
@@ -9,7 +9,7 @@ _CardKey: ; 50779
 	jr nz, .nope
 ; Are we facing the slot?
 	ld a, [PlayerDirection]
-	and $c
+	and %1100
 	cp OW_UP
 	jr nz, .nope
 
@@ -23,12 +23,12 @@ _CardKey: ; 50779
 ; Let's use the Card Key.
 	ld hl, .CardKeyScript
 	call QueueScript
-	ld a, $1
+	ld a, TRUE
 	ld [wItemEffectSucceeded], a
 	ret
 
 .nope
-	ld a, $0
+	ld a, FALSE
 	ld [wItemEffectSucceeded], a
 	ret
 ; 507af
diff --git a/event/celebi.asm b/event/celebi.asm
index 865bd579b..d9c188f1a 100755
--- a/event/celebi.asm
+++ b/event/celebi.asm
@@ -114,7 +114,7 @@ CelebiEvent_SpawnLeaf: ; 49944
 	add $40
 	ld d, a
 	ld e, $0
-	ld a, SPRITE_ANIM_INDEX_18 ; fly land
+	ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
diff --git a/event/daycare.asm b/event/daycare.asm
index 42e3d62f0..8125fb9d9 100755
--- a/event/daycare.asm
+++ b/event/daycare.asm
@@ -1,167 +1,188 @@
+	const_def
+	const DAYCARETEXT_00
+	const DAYCARETEXT_01
+	const DAYCARETEXT_02
+	const DAYCARETEXT_03
+	const DAYCARETEXT_04
+	const DAYCARETEXT_05
+	const DAYCARETEXT_06
+	const DAYCARETEXT_07
+	const DAYCARETEXT_08
+	const DAYCARETEXT_09
+	const DAYCARETEXT_0A
+	const DAYCARETEXT_0B
+	const DAYCARETEXT_0C
+	const DAYCARETEXT_0D
+	const DAYCARETEXT_0E
+	const DAYCARETEXT_0F
+	const DAYCARETEXT_10
+	const DAYCARETEXT_11
+	const DAYCARETEXT_12
+	const DAYCARETEXT_13
+
 Special_DayCareMan: ; 166d6
 	ld hl, wDaycareMan
 	bit 0, [hl]
-	jr nz, .asm_166fe
+	jr nz, .AskWithdrawMon
 	ld hl, wDaycareMan
-	ld a, $0
-	call Function1678f
-	jr c, .asm_16724
-	call Function16798
-	jr c, .asm_16721
+	ld a, DAYCARETEXT_00
+	call DayCareManIntroText
+	jr c, .cancel
+	call DayCareAskDepositPokemon
+	jr c, .print_text
 	callba Functionde2a
 	ld hl, wDaycareMan
 	set 0, [hl]
-	call Function167f6
-	call Function16a3b
+	call DayCare_DepositPokemonText
+	call DayCare_InitBreeding
 	ret
 
-.asm_166fe
+.AskWithdrawMon
 	callba Functione698
 	ld hl, wBreedMon1Nick
 	call Function1686d
 	call Function16807
-	jr c, .asm_16721
+	jr c, .print_text
 	callba Functiondd21
 	call Function16850
 	ld hl, wDaycareMan
 	res 0, [hl]
 	res 5, [hl]
-	jr .asm_16724
+	jr .cancel
 
-.asm_16721
-	call Function1689b
+.print_text
+	call PrintDayCareText
 
-.asm_16724
-	ld a, $13
-	call Function1689b
+.cancel
+	ld a, DAYCARETEXT_13
+	call PrintDayCareText
 	ret
 ; 1672a
 
 Special_DayCareLady: ; 1672a
 	ld hl, wDaycareLady
 	bit 0, [hl]
-	jr nz, .asm_16752
+	jr nz, .AskWithdrawMon
 	ld hl, wDaycareLady
-	ld a, $2
-	call Function16781
-	jr c, .asm_1677b
-	call Function16798
-	jr c, .asm_16778
+	ld a, DAYCARETEXT_02
+	call DayCareLadyIntroText
+	jr c, .cancel
+	call DayCareAskDepositPokemon
+	jr c, .print_text
 	callba Functionde37
 	ld hl, wDaycareLady
 	set 0, [hl]
-	call Function167f6
-	call Function16a3b
+	call DayCare_DepositPokemonText
+	call DayCare_InitBreeding
 	ret
 
-.asm_16752
+.AskWithdrawMon
 	callba Functione6b3
 	ld hl, wBreedMon2Nick
 	call Function1686d
 	call Function16807
-	jr c, .asm_16778
+	jr c, .print_text
 	callba Functiondd42
 	call Function16850
 	ld hl, wDaycareLady
 	res 0, [hl]
 	ld hl, wDaycareMan
 	res 5, [hl]
-	jr .asm_1677b
+	jr .cancel
 
-.asm_16778
-	call Function1689b
+.print_text
+	call PrintDayCareText
 
-.asm_1677b
-	ld a, $13
-	call Function1689b
+.cancel
+	ld a, DAYCARETEXT_13
+	call PrintDayCareText
 	ret
 ; 16781
 
-Function16781: ; 16781
+DayCareLadyIntroText: ; 16781
 	bit 7, [hl]
-	jr nz, .asm_16788
+	jr nz, .okay
 	set 7, [hl]
 	inc a
-
-.asm_16788
-	call Function1689b
+.okay
+	call PrintDayCareText
 	call YesNoBox
 	ret
 ; 1678f
 
-Function1678f: ; 1678f
+DayCareManIntroText: ; 1678f
 	set 7, [hl]
-	call Function1689b
+	call PrintDayCareText
 	call YesNoBox
 	ret
 ; 16798
 
-Function16798: ; 16798
+DayCareAskDepositPokemon: ; 16798
 	ld a, [PartyCount]
 	cp 2
-	jr c, .asm_167e5
-	ld a, 4
-	call Function1689b
+	jr c, .OnlyOneMon
+	ld a, DAYCARETEXT_04
+	call PrintDayCareText
 	ld b, 6
 	callba SelectTradeOrDaycareMon
-	jr c, .asm_167dd
+	jr c, .Declined
 	ld a, [CurPartySpecies]
 	cp EGG
-	jr z, .asm_167e1
+	jr z, .Egg
 	callba CheckCurPartyMonFainted
-	jr c, .asm_167e9
+	jr c, .OutOfUsableMons
 	ld hl, PartyMon1Item
 	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [CurPartyMon]
 	call AddNTimes
 	ld d, [hl]
 	callba ItemIsMail
-	jr c, .asm_167ed
+	jr c, .HoldingMail
 	ld hl, PartyMonNicknames
 	ld a, [CurPartyMon]
 	call GetNick
 	and a
 	ret
 
-.asm_167dd
-	ld a, $12
+.Declined
+	ld a, DAYCARETEXT_12
 	scf
 	ret
 
-.asm_167e1
-	ld a, $6
+.Egg
+	ld a, DAYCARETEXT_06
 	scf
 	ret
 
-.asm_167e5
-	ld a, $7
+.OnlyOneMon
+	ld a, DAYCARETEXT_07
 	scf
 	ret
 
-.asm_167e9
-	ld a, $8
+.OutOfUsableMons
+	ld a, DAYCARETEXT_08
 	scf
 	ret
 
-.asm_167ed
-	ld a, $a
+.HoldingMail
+	ld a, DAYCARETEXT_0A
 	scf
 	ret
 ; 167f1
 
-UnknownText_0x167f1: ; 0x167f1
+.DummyText: ; 0x167f1
 	;
 	text_jump UnknownText_0x1bdaa7
 	db "@"
 ; 0x167f6
 
-Function167f6: ; 167f6
-	ld a, $5
-	call Function1689b
+DayCare_DepositPokemonText: ; 167f6
+	ld a, DAYCARETEXT_05
+	call PrintDayCareText
 	ld a, [CurPartySpecies]
 	call PlayCry
-	ld a, $9
-	call Function1689b
+	ld a, DAYCARETEXT_09
+	call PrintDayCareText
 	ret
 ; 16807
 
@@ -170,18 +191,18 @@ Function16807: ; 16807
 	and a
 	jr nz, .asm_16819
 	ld a, $f
-	call Function1689b
+	call PrintDayCareText
 	call YesNoBox
 	jr c, .asm_16844
 	jr .asm_1682d
 
 .asm_16819
 	ld a, $b
-	call Function1689b
+	call PrintDayCareText
 	call YesNoBox
 	jr c, .asm_16844
 	ld a, $c
-	call Function1689b
+	call PrintDayCareText
 	call YesNoBox
 	jr c, .asm_16844
 
@@ -217,11 +238,11 @@ Function16850: ; 16850
 	ld de, Money
 	callba TakeMoney
 	ld a, $d
-	call Function1689b
+	call PrintDayCareText
 	ld a, [CurPartySpecies]
 	call PlayCry
 	ld a, $e
-	call Function1689b
+	call PrintDayCareText
 	ret
 ; 1686d
 
@@ -248,7 +269,7 @@ Function1686d: ; 1686d
 	ret
 ; 1689b
 
-Function1689b: ; 1689b
+PrintDayCareText: ; 1689b
 	ld e, a
 	ld d, 0
 	ld hl, TextTable_168aa
@@ -263,143 +284,143 @@ endr
 ; 168aa
 
 TextTable_168aa: ; 168aa
-	dw UnknownText_0x168d2
-	dw UnknownText_0x168d7
-	dw UnknownText_0x168dc
-	dw UnknownText_0x168e1
-	dw UnknownText_0x168e6
-	dw UnknownText_0x168ff
-	dw UnknownText_0x168f0
-	dw UnknownText_0x168eb
-	dw UnknownText_0x168fa
-	dw UnknownText_0x16904
-	dw UnknownText_0x168f5
-	dw UnknownText_0x16909
-	dw UnknownText_0x1690e
-	dw UnknownText_0x16913
-	dw UnknownText_0x16918
-	dw UnknownText_0x1691d
-	dw UnknownText_0x16922
-	dw UnknownText_0x16927
-	dw UnknownText_0x1692c
-	dw UnknownText_0x16931
+	dw .DayCareManIntro ; 00
+	dw .DayCareManOddEgg ; 01
+	dw .DayCareLadyIntro ; 02
+	dw .DayCareLadyOddEgg ; 03
+	dw .WhichOne ; 04
+	dw .OkayIllRaiseYourMon ; 05
+	dw .CantAcceptEgg ; 06
+	dw .JustOneMon ; 07
+	dw .LastHealthyMon ; 08
+	dw .ComeBackForItLater ; 09
+	dw .RemoveMail ; 0a
+	dw .AreWeGeniusesOrWhat ; 0b
+	dw .AskRetrieveMon ; 0c
+	dw .PerfectHeresYourMon ; 0d
+	dw .GotBackMon ; 0e
+	dw .ImmediatelyWithdrawMon ; 0f
+	dw .PartyFull ; 10
+	dw .NotEnoughMoney ; 11
+	dw .OhFineThen ; 12
+	dw .ComeAgain ; 13
 ; 168d2
 
-UnknownText_0x168d2: ; 0x168d2
+.DayCareManIntro: ; 0x168d2
 	; I'm the DAY-CARE MAN. Want me to raise a #MON?
 	text_jump UnknownText_0x1bdaa9
 	db "@"
 ; 0x168d7
 
-UnknownText_0x168d7: ; 0x168d7
+.DayCareManOddEgg: ; 0x168d7
 	; I'm the DAY-CARE MAN. Do you know about EGGS? I was raising #MON with my wife, you see. We were shocked to find an EGG! How incredible is that? So, want me to raise a #MON?
 	text_jump UnknownText_0x1bdad8
 	db "@"
 ; 0x168dc
 
-UnknownText_0x168dc: ; 0x168dc
+.DayCareLadyIntro: ; 0x168dc
 	; I'm the DAY-CARE LADY. Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdb85
 	db "@"
 ; 0x168e1
 
-UnknownText_0x168e1: ; 0x168e1
+.DayCareLadyOddEgg: ; 0x168e1
 	; I'm the DAY-CARE LADY. Do you know about EGGS? My husband and I were raising some #MON, you see. We were shocked to find an EGG! How incredible could that be? Should I raise a #MON for you?
 	text_jump UnknownText_0x1bdbbb
 	db "@"
 ; 0x168e6
 
-UnknownText_0x168e6: ; 0x168e6
+.WhichOne: ; 0x168e6
 	; What should I raise for you?
 	text_jump UnknownText_0x1bdc79
 	db "@"
 ; 0x168eb
 
-UnknownText_0x168eb: ; 0x168eb
+.JustOneMon: ; 0x168eb
 	; Oh? But you have just one #MON.
 	text_jump UnknownText_0x1bdc97
 	db "@"
 ; 0x168f0
 
-UnknownText_0x168f0: ; 0x168f0
+.CantAcceptEgg: ; 0x168f0
 	; Sorry, but I can't accept an EGG.
 	text_jump UnknownText_0x1bdcb8
 	db "@"
 ; 0x168f5
 
-UnknownText_0x168f5: ; 0x168f5
+.RemoveMail: ; 0x168f5
 	; Remove MAIL before you come see me.
 	text_jump UnknownText_0x1bdcda
 	db "@"
 ; 0x168fa
 
-UnknownText_0x168fa: ; 0x168fa
+.LastHealthyMon: ; 0x168fa
 	; If you give me that, what will you battle with?
 	text_jump UnknownText_0x1bdcff
 	db "@"
 ; 0x168ff
 
-UnknownText_0x168ff: ; 0x168ff
+.OkayIllRaiseYourMon: ; 0x168ff
 	; OK. I'll raise your @ .
 	text_jump UnknownText_0x1bdd30
 	db "@"
 ; 0x16904
 
-UnknownText_0x16904: ; 0x16904
+.ComeBackForItLater: ; 0x16904
 	; Come back for it later.
 	text_jump UnknownText_0x1bdd4b
 	db "@"
 ; 0x16909
 
-UnknownText_0x16909: ; 0x16909
+.AreWeGeniusesOrWhat: ; 0x16909
 	; Are we geniuses or what? Want to see your @ ?
 	text_jump UnknownText_0x1bdd64
 	db "@"
 ; 0x1690e
 
-UnknownText_0x1690e: ; 0x1690e
+.AskRetrieveMon: ; 0x1690e
 	; Your @ has grown a lot. By level, it's grown by @ . If you want your #MON back, it will cost ¥@ .
 	text_jump UnknownText_0x1bdd96
 	db "@"
 ; 0x16913
 
-UnknownText_0x16913: ; 0x16913
+.PerfectHeresYourMon: ; 0x16913
 	; Perfect! Here's your #MON.
 	text_jump UnknownText_0x1bde04
 	db "@"
 ; 0x16918
 
-UnknownText_0x16918: ; 0x16918
+.GotBackMon: ; 0x16918
 	; got back @ .
 	text_jump UnknownText_0x1bde1f
 	db "@"
 ; 0x1691d
 
-UnknownText_0x1691d: ; 0x1691d
+.ImmediatelyWithdrawMon: ; 0x1691d
 	; Huh? Back already? Your @ needs a little more time with us. If you want your #MON back, it will cost ¥100.
 	text_jump UnknownText_0x1bde32
 	db "@"
 ; 0x16922
 
-UnknownText_0x16922: ; 0x16922
+.PartyFull: ; 0x16922
 	; You have no room for it.
 	text_jump UnknownText_0x1bdea2
 	db "@"
 ; 0x16927
 
-UnknownText_0x16927: ; 0x16927
+.NotEnoughMoney: ; 0x16927
 	; You don't have enough money.
 	text_jump UnknownText_0x1bdebc
 	db "@"
 ; 0x1692c
 
-UnknownText_0x1692c: ; 0x1692c
+.OhFineThen: ; 0x1692c
 	; Oh, fine then.
 	text_jump UnknownText_0x1bded9
 	db "@"
 ; 0x16931
 
-UnknownText_0x16931: ; 0x16931
+.ComeAgain: ; 0x16931
 	; Come again.
 	text_jump UnknownText_0x1bdee9
 	db "@"
@@ -408,94 +429,95 @@ UnknownText_0x16931: ; 0x16931
 Special_DayCareManOutside: ; 16936
 	ld hl, wDaycareMan
 	bit 6, [hl]
-	jr nz, Function16949
-	ld hl, UnknownText_0x16944
+	jr nz, .AskGiveEgg
+	ld hl, .NotYet
 	call PrintText
 	ret
 
-UnknownText_0x16944: ; 0x16944
+.NotYet: ; 0x16944
 	; Not yet…
 	text_jump UnknownText_0x1bdef6
 	db "@"
 ; 0x16949
 
-Function16949: ; 16949
-	ld hl, UnknownText_0x16993
+.AskGiveEgg: ; 16949
+	ld hl, .IntroText
 	call PrintText
 	call YesNoBox
-	jr c, .asm_1697c
+	jr c, .Declined
 	ld a, [PartyCount]
 	cp PARTY_LENGTH
-	jr nc, .asm_16987
-	call Function169ac
+	jr nc, .PartyFull
+	call DayCare_GiveEgg
 	ld hl, wDaycareMan
 	res 6, [hl]
-	call Function16a3b
-	ld hl, UnknownText_0x16998
+	call DayCare_InitBreeding
+	ld hl, .GotEggText
 	call PrintText
 	ld de, SFX_GET_EGG_FROM_DAYCARE_LADY
 	call PlaySFX
 	ld c, 120
 	call DelayFrames
-	ld hl, UnknownText_0x1699d
-	jr .asm_1697f
+	ld hl, .TakeGoodCareOfItText
+	jr .Load0
 
-.asm_1697c
-	ld hl, UnknownText_0x169a2
+.Declined
+	ld hl, .IllKeepItThanksText
 
-.asm_1697f
+.Load0
 	call PrintText
 	xor a
 	ld [ScriptVar], a
 	ret
 
-.asm_16987
-	ld hl, UnknownText_0x169a7
+.PartyFull
+	ld hl, .PartyFullText
 	call PrintText
 	ld a, $1
 	ld [ScriptVar], a
 	ret
 ; 16993
 
-UnknownText_0x16993: ; 0x16993
+.IntroText: ; 0x16993
 	; Ah, it's you! We were raising your #MON, and my goodness, were we surprised! Your #MON had an EGG! We don't know how it got there, but your #MON had it. You want it?
 	text_jump UnknownText_0x1bdf00
 	db "@"
 ; 0x16998
 
-UnknownText_0x16998: ; 0x16998
+.GotEggText: ; 0x16998
 	; received the EGG!
 	text_jump UnknownText_0x1bdfa5
 	db "@"
 ; 0x1699d
 
-UnknownText_0x1699d: ; 0x1699d
+.TakeGoodCareOfItText: ; 0x1699d
 	; Take good care of it.
 	text_jump UnknownText_0x1bdfba
 	db "@"
 ; 0x169a2
 
-UnknownText_0x169a2: ; 0x169a2
+.IllKeepItThanksText: ; 0x169a2
 	; Well then, I'll keep it. Thanks!
 	text_jump UnknownText_0x1bdfd1
 	db "@"
 ; 0x169a7
 
-UnknownText_0x169a7: ; 0x169a7
+.PartyFullText: ; 0x169a7
 	; You have no room in your party. Come back later.
 	text_jump UnknownText_0x1bdff2
 	db "@"
 ; 0x169ac
 
-Function169ac: ; 169ac
+DayCare_GiveEgg: ; 169ac
 	ld a, [wEggMonLevel]
 	ld [CurPartyLevel], a
 	ld hl, PartyCount
 	ld a, [hl]
 	cp PARTY_LENGTH
-	jr nc, .asm_16a2f
+	jr nc, .PartyFull
 	inc a
 	ld [hl], a
+
 	ld c, a
 	ld b, 0
 	add hl, bc
@@ -504,24 +526,28 @@ Function169ac: ; 169ac
 	ld a, [wEggMonSpecies]
 	ld [CurSpecies], a
 	ld [CurPartySpecies], a
-	ld a, $ff
+	ld a, -1
 	ld [hl], a
+
 	ld hl, PartyMonNicknames
 	ld bc, PKMN_NAME_LENGTH
-	call Function16a31
+	call DayCare_GetCurrentPartyMember
 	ld hl, wEggNick
 	call CopyBytes
+
 	ld hl, PartyMonOT
 	ld bc, NAME_LENGTH
-	call Function16a31
+	call DayCare_GetCurrentPartyMember
 	ld hl, wEggOT
 	call CopyBytes
+
 	ld hl, PartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
-	call Function16a31
+	call DayCare_GetCurrentPartyMember
 	ld hl, wEggMon
 	ld bc, wEggMonEnd - wEggMon
 	call CopyBytes
+
 	call GetBaseData
 	ld a, [PartyCount]
 	dec a
@@ -550,12 +576,12 @@ Function169ac: ; 169ac
 	and a
 	ret
 
-.asm_16a2f
+.PartyFull
 	scf
 	ret
 ; 16a31
 
-Function16a31: ; 16a31
+DayCare_GetCurrentPartyMember: ; 16a31
 	ld a, [PartyCount]
 	dec a
 	call AddNTimes
@@ -564,7 +590,7 @@ Function16a31: ; 16a31
 	ret
 ; 16a3b
 
-Function16a3b: ; 16a3b
+DayCare_InitBreeding: ; 16a3b
 	ld a, [wDaycareLady]
 	bit 0, a
 	ret z
@@ -579,15 +605,15 @@ Function16a3b: ; 16a3b
 	ret z
 	ld hl, wDaycareMan
 	set 5, [hl]
-.asm_16a59
+.loop
 	call Random
 	cp 150
-	jr c, .asm_16a59
+	jr c, .loop
 	ld [wStepsToEgg], a
-	jp Function16a66
+	jp .UselessJump
 ; 16a66
 
-Function16a66: ; 16a66
+.UselessJump: ; 16a66
 	xor a
 	ld hl, wEggMon
 	ld bc, wEggMonEnd - wEggMon
@@ -609,24 +635,24 @@ Function16a66: ; 16a66
 	ld a, [wBreedMon1Species]
 	cp DITTO
 	ld a, $1
-	jr z, .asm_16ab6
+	jr z, .LoadWhichBreedmonIsTheMother
 	ld a, [wBreedMon2Species]
 	cp DITTO
 	ld a, $0
-	jr z, .asm_16ab6
+	jr z, .LoadWhichBreedmonIsTheMother
 	callba GetGender
 	ld a, $0
-	jr z, .asm_16ab6
+	jr z, .LoadWhichBreedmonIsTheMother
 	inc a
 
-.asm_16ab6
-	ld [wDittoInDaycare], a
+.LoadWhichBreedmonIsTheMother
+	ld [wBreedMotherOrNonDitto], a
 	and a
 	ld a, [wBreedMon1Species]
-	jr z, .asm_16ac2
+	jr z, .GotMother
 	ld a, [wBreedMon2Species]
 
-.asm_16ac2
+.GotMother
 	ld [CurPartySpecies], a
 	callab GetPreEvolution
 	callab GetPreEvolution
@@ -635,20 +661,20 @@ Function16a66: ; 16a66
 
 	ld a, [CurPartySpecies]
 	cp NIDORAN_F
-	jr nz, .asm_16ae8
+	jr nz, .GotEggSpecies
 	call Random
-	cp $80
+	cp 1 + 50 percent
 	ld a, NIDORAN_F
-	jr c, .asm_16ae8
+	jr c, .GotEggSpecies
 	ld a, NIDORAN_M
-.asm_16ae8
+.GotEggSpecies
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
 	ld [wEggMonSpecies], a
 
 	call GetBaseData
 	ld hl, wEggNick
-	ld de, String_16be0
+	ld de, .String_EGG
 	call CopyName2
 	ld hl, PlayerName
 	ld de, wEggOT
@@ -672,17 +698,17 @@ Function16a66: ; 16a66
 	ld hl, wEggMonExp
 	ld a, [hMultiplicand]
 	ld [hli], a
-	ld a, [$ffb5]
+	ld a, [hMultiplicand + 1]
 	ld [hli], a
-	ld a, [$ffb6]
+	ld a, [hMultiplicand + 2]
 	ld [hl], a
 	xor a
-	ld b, $a
+	ld b, wEggMonDVs - wEggMonStatExp
 	ld hl, wEggMonStatExp
-.asm_16b46
+.loop2
 	ld [hli], a
 	dec b
-	jr nz, .asm_16b46
+	jr nz, .loop2
 	ld hl, wEggMonDVs
 	call Random
 	ld [hli], a
@@ -693,35 +719,35 @@ Function16a66: ; 16a66
 	ld de, wBreedMon1DVs
 	ld a, [wBreedMon1Species]
 	cp DITTO
-	jr z, .asm_16b98
+	jr z, .GotDVs
 	ld de, wBreedMon2DVs
 	ld a, [wBreedMon2Species]
 	cp DITTO
-	jr z, .asm_16b98
-	ld a, $3
+	jr z, .GotDVs
+	ld a, BREEDMON
 	ld [MonType], a
 	push hl
 	callba GetGender
 	pop hl
 	ld de, wBreedMon1DVs
 	ld bc, wBreedMon2DVs
-	jr c, .asm_16bab
-	jr z, .asm_16b90
-	ld a, [wDittoInDaycare]
+	jr c, .SkipDVs
+	jr z, .ParentCheck2
+	ld a, [wBreedMotherOrNonDitto]
 	and a
-	jr z, .asm_16b98
+	jr z, .GotDVs
 	ld d, b
 	ld e, c
-	jr .asm_16b98
+	jr .GotDVs
 
-.asm_16b90
-	ld a, [wDittoInDaycare]
+.ParentCheck2
+	ld a, [wBreedMotherOrNonDitto]
 	and a
-	jr nz, .asm_16b98
+	jr nz, .GotDVs
 	ld d, b
 	ld e, c
 
-.asm_16b98
+.GotDVs
 	ld a, [de]
 	inc de
 	and $f
@@ -738,15 +764,15 @@ Function16a66: ; 16a66
 	add b
 	ld [hl], a
 
-.asm_16bab
+.SkipDVs
 	ld hl, StringBuffer1
-	ld de, wd050
+	ld de, wMonOrItemNameBuffer
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ld hl, wEggMonMoves
 	ld de, wEggMonPP
 	predef FillPP
-	ld hl, wd050
+	ld hl, wMonOrItemNameBuffer
 	ld de, StringBuffer1
 	ld bc, NAME_LENGTH
 	call CopyBytes
@@ -763,6 +789,6 @@ endr
 	ret
 ; 16be0
 
-String_16be0: ; 16be0
+.String_EGG: ; 16be0
 	db "EGG@"
 ; 16be4
diff --git a/event/dratini.asm b/event/dratini.asm
index 24876f9f4..d8ecdc803 100644
--- a/event/dratini.asm
+++ b/event/dratini.asm
@@ -8,8 +8,8 @@ SpecialDratini: ; 0x8b170
 	ret nc
 	ld bc, PartyCount
 	ld a, [bc]
-	ld hl, 0
-	call GetNthPartyMon
+	ld hl, MON_SPECIES
+	call .GetNthPartyMon
 	ld a, [bc]
 	ld c, a
 	ld de, PARTYMON_STRUCT_LENGTH
@@ -85,7 +85,7 @@ endr
 	db TWISTER
 	db 0
 
-GetNthPartyMon: ; 0x8b1ce
+.GetNthPartyMon: ; 0x8b1ce
 ; inputs:
 ; hl must be set to 0 before calling this function.
 ; a must be set to the number of Pokémon in the party.
@@ -106,6 +106,7 @@ GetNthPartyMon: ; 0x8b1ce
 	dec a
 	jr nz, .loop
 	ret
+
 .EmptyParty
 	scf
 	ret
diff --git a/event/field_moves.asm b/event/field_moves.asm
index 82b1c2b25..9ac542f6d 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -330,15 +330,15 @@ FlyFromAnim: ; 8caed
 	ld [VramState], a
 	call FlyFunction_InitGFX
 	depixel 10, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0A
+	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $84
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], SPRITE_ANIM_SEQ_16
-	ld a, $80
+	ld [hl], SPRITE_ANIM_SEQ_FLY_FROM
+	ld a, 128
 	ld [wcf64], a
 .loop
 	ld a, [wJumptableIndex]
@@ -347,7 +347,7 @@ FlyFromAnim: ; 8caed
 	ld a, 0 * 4
 	ld [wCurrSpriteOAMAddr], a
 	callab DoNextFrameForAllSprites
-	call Function8cbc8
+	call FlyFunction_FrameTimer
 	call DelayFrame
 	jr .loop
 
@@ -365,18 +365,18 @@ FlyToAnim: ; 8cb33
 	ld [VramState], a
 	call FlyFunction_InitGFX
 	depixel 31, 10, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0A
+	ld a, SPRITE_ANIM_INDEX_WALK_CYCLE
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $84
 	ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
 	add hl, bc
-	ld [hl], $18
+	ld [hl], SPRITE_ANIM_SEQ_FLY_TO
 	ld hl, SPRITEANIMSTRUCT_0F
 	add hl, bc
-	ld [hl], $58
-	ld a, $40
+	ld [hl], 11 * 8
+	ld a, 64
 	ld [wcf64], a
 .loop
 	ld a, [wJumptableIndex]
@@ -385,28 +385,28 @@ FlyToAnim: ; 8cb33
 	ld a, 0 * 4
 	ld [wCurrSpriteOAMAddr], a
 	callab DoNextFrameForAllSprites
-	call Function8cbc8
+	call FlyFunction_FrameTimer
 	call DelayFrame
 	jr .loop
 
 .exit
 	pop af
 	ld [VramState], a
-	call Function8cb82
+	call .RestorePlayerSprite_DespawnLeaves
 	ret
 
-Function8cb82: ; 8cb82 (23:4b82)
+.RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
 	ld hl, Sprites + 2 ; Tile ID
 	xor a
 	ld c, $4
-.loop
+.loop2
 	ld [hli], a
 rept 3
 	inc hl
 endr
 	inc a
 	dec c
-	jr nz, .loop
+	jr nz, .loop2
 	ld hl, Sprites + 4 * 4
 	ld bc, SpritesEnd - (Sprites + 4 * 4)
 	xor a
@@ -432,8 +432,8 @@ FlyFunction_InitGFX: ; 8cb9b (23:4b9b)
 	ld [wJumptableIndex], a
 	ret
 
-Function8cbc8: ; 8cbc8 (23:4bc8)
-	call Function8cbe6
+FlyFunction_FrameTimer: ; 8cbc8 (23:4bc8)
+	call .SpawnLeaf
 	ld hl, wcf64
 	ld a, [hl]
 	and a
@@ -452,19 +452,19 @@ Function8cbc8: ; 8cbc8 (23:4bc8)
 	set 7, [hl]
 	ret
 
-Function8cbe6: ; 8cbe6 (23:4be6)
+.SpawnLeaf: ; 8cbe6 (23:4be6)
 	ld hl, wcf65
 	ld a, [hl]
 	inc [hl]
 	and $7
 	ret nz
 	ld a, [hl]
-	and $18
+	and (6 * 8) >> 1
 	sla a
-	add $40
+	add 8 * 8 ; gives a number in [$40, $50, $60, $70]
 	ld d, a
 	ld e, $0
-	ld a, SPRITE_ANIM_INDEX_18 ; fly land
+	ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
diff --git a/event/itemball.asm b/event/itemball.asm
index 9c9e03ee7..083d7efc2 100755
--- a/event/itemball.asm
+++ b/event/itemball.asm
@@ -37,7 +37,7 @@ FindItemInBallScript:: ; 0x122ce
 	xor a
 	ld [ScriptVar], a
 	ld a, [EngineBuffer1]
-	ld [wd265], a
+	ld [wNamedObjectIndexBuffer], a
 	call GetItemName
 	ld hl, StringBuffer3
 	call CopyName2
diff --git a/event/itemfinder.asm b/event/itemfinder.asm
index 5e5e9c40b..5356a1f86 100755
--- a/event/itemfinder.asm
+++ b/event/itemfinder.asm
@@ -15,7 +15,7 @@ ItemFinder: ; 12580
 ; 12599
 
 .ItemfinderSound: ; 12599
-	ld c, $4
+	ld c, 4
 .sfx_loop
 	push bc
 	ld de, SFX_SECOND_PART_OF_ITEMFINDER
diff --git a/event/kurt.asm b/event/kurt.asm
index 54461aecb..f1050fcdf 100644
--- a/event/kurt.asm
+++ b/event/kurt.asm
@@ -1,22 +1,22 @@
 Kurt_PrintTextWhichApricorn: ; 88000
-	ld hl, UnknownText_0x88007
+	ld hl, .Text
 	call PrintText
 	ret
 ; 88007
 
-UnknownText_0x88007: ; 0x88007
+.Text: ; 0x88007
 	; Which APRICORN should I use?
 	text_jump UnknownText_0x1bc06b
 	db "@"
 ; 0x8800c
 
 Kurt_PrintTextHowMany: ; 8800c
-	ld hl, UnknownText_0x88013
+	ld hl, .Text
 	call PrintText
 	ret
 ; 88013
 
-UnknownText_0x88013: ; 0x88013
+.Text: ; 0x88013
 	; How many should I make?
 	text_jump UnknownText_0x1bc089
 	db "@"
@@ -69,7 +69,7 @@ Kurt_SelectApricorn: ; 88055
 	call UpdateSprites
 	call ScrollingMenu
 	ld a, [wMenuJoypad]
-	cp $2
+	cp B_BUTTON
 	jr z, .nope
 	ld a, [MenuSelection]
 	cp -1
@@ -167,7 +167,7 @@ Kurt_SelectQuantity: ; 880c2
 
 .PlaceApricornName: ; 88116
 	call MenuBoxCoord2Tile
-	ld de, $0015
+	ld de, SCREEN_WIDTH + 1
 	add hl, de
 	ld d, h
 	ld e, l
@@ -177,7 +177,7 @@ Kurt_SelectQuantity: ; 880c2
 
 PlaceApricornQuantity: ; 88126
 	call MenuBoxCoord2Tile
-	ld de, $0032
+	ld de, 2 * SCREEN_WIDTH + 10
 	add hl, de
 	ld [hl], "×"
 	inc hl
@@ -233,7 +233,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 	xor a
 	ld [CurItemQuantity], a
 	ld a, -1
-	ld [wd002], a
+	ld [wApricorns], a
 
 ; Search for [CurItem] in the bag.
 .loop1
@@ -253,7 +253,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 ; Increment the result counter and store the bag index of the match.
 	ld d, $0
 	push hl
-	ld hl, wd002
+	ld hl, wApricorns
 	add hl, de
 	inc e
 	ld a, [CurItemQuantity]
@@ -271,7 +271,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 	jr z, .done
 	dec a
 	jr z, .OnlyOne
-	ld hl, wd002
+	ld hl, wApricorns
 
 .loop2
 	ld a, [hl]
@@ -316,7 +316,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
 	jr nz, .loop2
 
 .OnlyOne
-	ld hl, wd002
+	ld hl, wApricorns
 .loop4
 	ld a, [hl]
 	cp -1
diff --git a/event/magikarp.asm b/event/magikarp.asm
index a60d90336..2a5b98332 100644
--- a/event/magikarp.asm
+++ b/event/magikarp.asm
@@ -1,5 +1,3 @@
-
-
 Special_CheckMagikarpLength: ; fbb32
 	; Returns 3 if you select a Magikarp that beats the previous record.
 	; Returns 2 if you select a Magikarp, but the current record is longer.
@@ -81,7 +79,7 @@ Special_CheckMagikarpLength: ; fbb32
 ; 0xfbbae
 
 Magikarp_LoadFeetInchesChars: ; fbbae
-	ld hl, VTiles2 + "′" * $10
+	ld hl, VTiles2 tile "′"
 	ld de, .feetinchchars
 	lb bc, BANK(.feetinchchars), 2
 	call Request2bpp
diff --git a/event/magnet_train.asm b/event/magnet_train.asm
index 55a3a77fa..c9115d110 100755
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -3,14 +3,14 @@ Special_MagnetTrain: ; 8cc04
 	and a
 	jr nz, .ToGoldenrod
 	ld a, 1 ; forwards
-	lb bc, $40, $60
-	ld de, $fca0
+	lb bc,  $40,  $60
+	lb de, (11 * 8) - (11 * 8 + 4), -$60
 	jr .continue
 
 .ToGoldenrod
 	ld a, -1 ; backwards
-	lb bc, $c0, $a0
-	ld de, $b460
+	lb bc, -$40, -$60
+	lb de, (11 * 8) + (11 * 8 + 4), $60
 
 .continue
 	ld h, a
@@ -18,21 +18,23 @@ Special_MagnetTrain: ; 8cc04
 	push af
 	ld a, $5
 	ld [rSVBK], a
+
 	ld a, h
-	ld [w5_d191], a
+	ld [wMagnetTrainDirection], a
 	ld a, c
-	ld [w5_d192], a
+	ld [wMagnetTrainInitPosition], a
 	ld a, b
-	ld [w5_d193], a
+	ld [wMagnetTrainHoldPosition], a
 	ld a, e
-	ld [w5_d194], a
+	ld [wMagnetTrainFinalPosition], a
 	ld a, d
-	ld [w5_d195], a
+	ld [wMagnetTrainPlayerSpriteInitX], a
+
 	ld a, [hSCX]
 	push af
 	ld a, [hSCY]
 	push af
-	call Function8ccc9
+	call MagntTrain_LoadGFX_PlayMusic
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
@@ -44,14 +46,14 @@ Special_MagnetTrain: ; 8cc04
 	bit 7, a
 	jr nz, .done
 	callab PlaySpriteAnimations
-	call Function8cdf7
-	call Function8cc99
+	call MagnetTrain_Jumptable
+	call MagnetTrain_UpdateLYOverrides
 	call Function3b0c
 	call DelayFrame
 	jr .loop
 
 .initialize
-	call Function8ceae
+	call MagnetTrain_Jumptable_FirstRunThrough
 	jr .loop
 
 .done
@@ -69,6 +71,7 @@ Special_MagnetTrain: ; 8cc04
 	ld [Requested2bppDest + 1], a
 	ld [Requested2bpp], a
 	call ClearTileMap
+
 	pop af
 	ld [hSCY], a
 	pop af
@@ -80,21 +83,21 @@ Special_MagnetTrain: ; 8cc04
 	ret
 ; 8cc99
 
-Function8cc99: ; 8cc99
+MagnetTrain_UpdateLYOverrides: ; 8cc99
 	ld hl, LYOverridesBackup
 	ld c, $2f
 	ld a, [wcf64]
 	add a
 	ld [hSCX], a
-	call Function8ccc4
+	call .loadloop
 	ld c, $30
 	ld a, [wcf65]
-	call Function8ccc4
+	call .loadloop
 	ld c, $31
 	ld a, [wcf64]
 	add a
-	call Function8ccc4
-	ld a, [wd191]
+	call .loadloop
+	ld a, [wMagnetTrainDirection]
 	ld d, a
 	ld hl, wcf64
 	ld a, [hl]
@@ -103,17 +106,15 @@ rept 2
 endr
 	ld [hl], a
 	ret
-; 8ccc4
 
-Function8ccc4: ; 8ccc4
-.asm_8ccc4
+.loadloop
 	ld [hli], a
 	dec c
-	jr nz, .asm_8ccc4
+	jr nz, .loadloop
 	ret
 ; 8ccc9
 
-Function8ccc9: ; 8ccc9
+MagntTrain_LoadGFX_PlayMusic: ; 8ccc9
 	call ClearBGPalettes
 	call ClearSprites
 	call DisableLCD
@@ -135,20 +136,20 @@ Function8ccc9: ; 8ccc9
 	pop af
 	ld [rSVBK], a
 	ld hl, VTiles0
-	ld c, $4
+	ld c, 4
 	call Request2bpp
-	ld hl, $c0
+	ld hl, 12 tiles
 	add hl, de
 	ld d, h
 	ld e, l
 	ld hl, VTiles0 tile $04
-	ld c, $4
+	ld c, 4
 	call Request2bpp
-	call Function8cda6
+	call MagnetTrain_InitLYOverrides
 	ld hl, wJumptableIndex
 	xor a
 	ld [hli], a
-	ld a, [wd192]
+	ld a, [wMagnetTrainInitPosition]
 rept 3
 	ld [hli], a
 endr
@@ -160,13 +161,13 @@ endr
 DrawMagnetTrain: ; 8cd27
 	hlbgcoord 0, 0
 	xor a
-.asm_8cd2b
+.loop
 	call GetMagnetTrainBGTiles
 	ld b, 32 / 2
 	call .FillAlt
 	inc a
 	cp $12
-	jr c, .asm_8cd2b
+	jr c, .loop
 	hlbgcoord 0, 6
 	ld de, MagnetTrainTilemap1
 	ld c, 20
@@ -243,14 +244,14 @@ MagnetTrainBGTiles: ; 8cd82
 	db $5c, $5d ; bush
 ; 8cda6
 
-Function8cda6: ; 8cda6
+MagnetTrain_InitLYOverrides: ; 8cda6
 	ld hl, LYOverrides
-	ld bc, $90
-	ld a, [wd192]
+	ld bc, LYOverridesEnd - LYOverrides
+	ld a, [wMagnetTrainInitPosition]
 	call ByteFill
 	ld hl, LYOverridesBackup
-	ld bc, $90
-	ld a, [wd192]
+	ld bc, LYOverridesBackupEnd - LYOverridesBackup
+	ld a, [wMagnetTrainInitPosition]
 	call ByteFill
 	ld a, $43
 	ld [hLCDStatCustom], a
@@ -290,11 +291,11 @@ SetMagnetTrainPals: ; 8cdc3
 	ret
 ; 8cdf7
 
-Function8cdf7: ; 8cdf7
+MagnetTrain_Jumptable: ; 8cdf7
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
-	ld hl, Jumptable_8ce06
+	ld hl, .Jumptable
 rept 2
 	add hl, de
 endr
@@ -304,25 +305,26 @@ endr
 	jp [hl]
 ; 8ce06
 
-Jumptable_8ce06: ; 8ce06
-	dw Function8ce19
-	dw Function8ce6d
-	dw Function8ce47
-	dw Function8ce6d
-	dw Function8ce7a
-	dw Function8ce6d
-	dw Function8cea2
+.Jumptable: ; 8ce06
+	jumptable_start
+	jumptable .InitPlayerSpriteAnim
+	jumptable .WaitScene
+	jumptable .MoveTrain1
+	jumptable .WaitScene
+	jumptable .MoveTrain2
+	jumptable .WaitScene
+	jumptable .TrainArrived
 ; 8ce14
 
-Function8ce14: ; 8ce14
+.Next: ; 8ce14
 	ld hl, wJumptableIndex
 	inc [hl]
 	ret
 ; 8ce19
 
-Function8ce19: ; 8ce19
-	ld d, $55
-	ld a, [wOverworldMapAnchor + 1]
+.InitPlayerSpriteAnim: ; 8ce19
+	ld d, 10 * 8 + 5
+	ld a, [wMagnetTrainPlayerSpriteInitX]
 	ld e, a
 	ld b, SPRITE_ANIM_INDEX_15
 	ld a, [rSVBK]
@@ -331,67 +333,67 @@ Function8ce19: ; 8ce19
 	ld [rSVBK], a
 	ld a, [PlayerGender]
 	bit 0, a
-	jr z, .asm_8ce31
+	jr z, .got_gender
 	ld b, SPRITE_ANIM_INDEX_1F
 
-.asm_8ce31
+.got_gender
 	pop af
 	ld [rSVBK], a
 	ld a, b
 	call _InitSpriteAnimStruct
-	ld hl, $3
+	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
 	ld [hl], $0
-	call Function8ce14
+	call .Next
 	ld a, $80
 	ld [wcf66], a
 	ret
 ; 8ce47
 
-Function8ce47: ; 8ce47
-	ld hl, wd193
+.MoveTrain1: ; 8ce47
+	ld hl, wMagnetTrainHoldPosition
 	ld a, [wcf65]
 	cp [hl]
-	jr z, .asm_8ce64
+	jr z, .PrepareToHoldTrain
 	ld e, a
-	ld a, [wd191]
+	ld a, [wMagnetTrainDirection]
 	xor $ff
 	inc a
 	add e
 	ld [wcf65], a
 	ld hl, wGlobalAnimXOffset
-	ld a, [wd191]
+	ld a, [wMagnetTrainDirection]
 	add [hl]
 	ld [hl], a
 	ret
 
-.asm_8ce64
-	call Function8ce14
+.PrepareToHoldTrain
+	call .Next
 	ld a, $80
 	ld [wcf66], a
 	ret
 ; 8ce6d
 
-Function8ce6d: ; 8ce6d
+.WaitScene: ; 8ce6d
 	ld hl, wcf66
 	ld a, [hl]
 	and a
-	jr z, .asm_8ce76
+	jr z, .DoneWaiting
 	dec [hl]
 	ret
 
-.asm_8ce76
-	call Function8ce14
+.DoneWaiting
+	call .Next
 	ret
 ; 8ce7a
 
-Function8ce7a: ; 8ce7a
-	ld hl, wOverworldMapAnchor
+.MoveTrain2: ; 8ce7a
+	ld hl, wMagnetTrainFinalPosition
 	ld a, [wcf65]
 	cp [hl]
-	jr z, .asm_8ce9e
+	jr z, .PrepareToFinishAnim
 	ld e, a
-	ld a, [wd191]
+	ld a, [wMagnetTrainDirection]
 	xor $ff
 	inc a
 	ld d, a
@@ -401,7 +403,7 @@ rept 2
 endr
 	ld [wcf65], a
 	ld hl, wGlobalAnimXOffset
-	ld a, [wd191]
+	ld a, [wMagnetTrainDirection]
 	ld d, a
 	ld a, [hl]
 rept 2
@@ -412,12 +414,12 @@ endr
 
 	ret
 
-.asm_8ce9e
-	call Function8ce14
+.PrepareToFinishAnim
+	call .Next
 	ret
 ; 8cea2
 
-Function8cea2: ; 8cea2
+.TrainArrived: ; 8cea2
 	ld a, $80
 	ld [wJumptableIndex], a
 	ld de, SFX_TRAIN_ARRIVED
@@ -425,10 +427,10 @@ Function8cea2: ; 8cea2
 	ret
 ; 8ceae
 
-Function8ceae: ; 8ceae
+MagnetTrain_Jumptable_FirstRunThrough: ; 8ceae
 	callba PlaySpriteAnimations
-	call Function8cdf7
-	call Function8cc99
+	call MagnetTrain_Jumptable
+	call MagnetTrain_UpdateLYOverrides
 	call Function3b0c
 	call DelayFrame
 	ld a, [rSVBK]
diff --git a/event/mom.asm b/event/mom.asm
index 8be55b6c6..737d92a36 100644
--- a/event/mom.asm
+++ b/event/mom.asm
@@ -5,20 +5,20 @@ Special_BankOfMom: ; 16218
 	ld [hInMenu], a
 	xor a
 	ld [wJumptableIndex], a
-.asm_16223
+.loop
 	ld a, [wJumptableIndex]
 	bit 7, a
-	jr nz, .asm_1622f
-	call Function16233
-	jr .asm_16223
+	jr nz, .done
+	call .RunJumptable
+	jr .loop
 
-.asm_1622f
+.done
 	pop af
 	ld [hInMenu], a
 	ret
 ; 16233
 
-Function16233: ; 16233
+.RunJumptable: ; 16233
 	ld a, [wJumptableIndex]
 	ld e, a
 	ld d, 0
@@ -33,15 +33,16 @@ endr
 ; 16242
 
 .jumptable: ; 16242
-	dw .CheckIfBankInitialized
-	dw .InitializeBank
-	dw .IsThisAboutYourMoney
-	dw .AccessBankOfMom
-	dw .StoreMoney
-	dw .TakeMoney
-	dw .StopOrStartSavingMoney
-	dw .AskDST
-	dw .JustDoWhatYouCan
+	jumptable_start
+	jumptable .CheckIfBankInitialized
+	jumptable .InitializeBank
+	jumptable .IsThisAboutYourMoney
+	jumptable .AccessBankOfMom
+	jumptable .StoreMoney
+	jumptable .TakeMoney
+	jumptable .StopOrStartSavingMoney
+	jumptable .AskDST
+	jumptable .JustDoWhatYouCan
 ; 16254
 
 .CheckIfBankInitialized: ; 16254
@@ -309,72 +310,72 @@ DSTChecks: ; 16439
 	ld a, [wDST]
 	bit 7, a
 	ld a, [hHours]
-	jr z, .asm_16447
+	jr z, .NotDST
 	and a ; within one hour of 00:00?
 	jr z, .LostBooklet
 	jr .loop
 
-.asm_16447
+.NotDST
 	cp 23 ; within one hour of 23:00?
 	jr nz, .loop
 	; fallthrough
 
 .LostBooklet
-	call Function164ea
+	call .ClearBox
 	bccoord 1, 14
-	ld hl, UnknownText_0x164f4
+	ld hl, .Text_AdjustClock
 	call PlaceWholeStringInBoxAtOnce
 	call YesNoBox
 	ret c
-	call Function164ea
+	call .ClearBox
 	bccoord 1, 14
-	ld hl, LostInstructionBookletText
+	ld hl, .Text_LostInstructionBooklet
 	call PlaceWholeStringInBoxAtOnce
 	ret
 
 .loop
-	call Function164ea
+	call .ClearBox
 	bccoord 1, 14
 	ld a, [wDST]
 	bit 7, a
-	jr z, .asm_16497
-	ld hl, UnknownText_0x16508
+	jr z, .SetDST
+	ld hl, .Text_IsDSTOver
 	call PlaceWholeStringInBoxAtOnce
 	call YesNoBox
 	ret c
 	ld a, [wDST]
 	res 7, a
 	ld [wDST], a
-	call Function164d1
-	call Function164ea
+	call .SetClockBack
+	call .ClearBox
 	bccoord 1, 14
-	ld hl, UnknownText_0x1650d
+	ld hl, .Text_SetClockBack
 	call PlaceWholeStringInBoxAtOnce
 	ret
 
-.asm_16497
-	ld hl, UnknownText_0x164fe
+.SetDST
+	ld hl, .Text_SwitchToDST
 	call PlaceWholeStringInBoxAtOnce
 	call YesNoBox
 	ret c
 	ld a, [wDST]
 	set 7, a
 	ld [wDST], a
-	call Function164b9
-	call Function164ea
+	call .SetClockForward
+	call .ClearBox
 	bccoord 1, 14
-	ld hl, UnknownText_0x16503
+	ld hl, .Text_SetClockForward
 	call PlaceWholeStringInBoxAtOnce
 	ret
 ; 164b9
 
-Function164b9: ; 164b9
+.SetClockForward: ; 164b9
 	ld a, [StartHour]
 	add 1
 	sub 24
-	jr nc, .asm_164c4
+	jr nc, .DontLoopHourForward
 	add 24
-.asm_164c4
+.DontLoopHourForward
 	ld [StartHour], a
 	ccf
 	ld a, [StartDay]
@@ -383,61 +384,61 @@ Function164b9: ; 164b9
 	ret
 ; 164d1
 
-Function164d1: ; 164d1
+.SetClockBack: ; 164d1
 	ld a, [StartHour]
 	sub 1
-	jr nc, .asm_164da
+	jr nc, .DontLoopHourBack
 	add 24
-.asm_164da
+.DontLoopHourBack
 	ld [StartHour], a
 	ld a, [StartDay]
 	sbc 0
-	jr nc, .asm_164e6
+	jr nc, .DontLoopDayBack
 	add 7
-.asm_164e6
+.DontLoopDayBack
 	ld [StartDay], a
 	ret
 ; 164ea
 
-Function164ea: ; 164ea
+.ClearBox: ; 164ea
 	hlcoord 1, 14
 	lb bc, 3, 18
 	call ClearBox
 	ret
 ; 164f4
 
-UnknownText_0x164f4: ; 0x164f4
+.Text_AdjustClock: ; 0x164f4
 	; Do you want to adjust your clock for Daylight Saving Time?
 	text_jump UnknownText_0x1c6095
 	db "@"
 ; 0x164f9
 
-LostInstructionBookletText: ; 0x164f9
+.Text_LostInstructionBooklet: ; 0x164f9
 	; I lost the instruction booklet for the POKéGEAR.
 	; Come back again in a while.
 	text_jump UnknownText_0x1c60d1
 	db "@"
 ; 0x164fe
 
-UnknownText_0x164fe: ; 0x164fe
+.Text_SwitchToDST: ; 0x164fe
 	; Do you want to switch to Daylight Saving Time?
 	text_jump UnknownText_0x1c6000
 	db "@"
 ; 0x16503
 
-UnknownText_0x16503: ; 0x16503
+.Text_SetClockForward: ; 0x16503
 	; I set the clock forward by one hour.
 	text_jump UnknownText_0x1c6030
 	db "@"
 ; 0x16508
 
-UnknownText_0x16508: ; 0x16508
+.Text_IsDSTOver: ; 0x16508
 	; Is Daylight Saving Time over?
 	text_jump UnknownText_0x1c6056
 	db "@"
 ; 0x1650d
 
-UnknownText_0x1650d: ; 0x1650d
+.Text_SetClockBack: ; 0x1650d
 	; I put the clock back one hour.
 	text_jump UnknownText_0x1c6075
 	db "@"
diff --git a/event/mom_phone.asm b/event/mom_phone.asm
index b2bf0d2fd..5cbe44e95 100755
--- a/event/mom_phone.asm
+++ b/event/mom_phone.asm
@@ -9,40 +9,40 @@ MomTriesToBuySomething:: ; fcfec
 	ld [wdc18], a
 	call CheckBalance_MomItem2
 	ret nc
-	call Functionfd0c3
+	call Mom_GiveItemOrDoll
 	ret nc
-	ld b, BANK(UnknownScript_0xfd00f)
-	ld de, UnknownScript_0xfd00f
+	ld b, BANK(.Script)
+	ld de, .Script
 	callba LoadScriptBDE
 	scf
 	ret
 ; fd00f
 
-UnknownScript_0xfd00f: ; 0xfd00f
-	callasm Functionfd017
+.Script: ; 0xfd00f
+	callasm .ASMFunction
 	farjump Script_ReceivePhoneCall
 ; 0xfd017
 
-Functionfd017: ; fd017
+.ASMFunction: ; fd017
 	call MomBuysItem_DeductFunds
-	call Functionfd0eb
+	call Mom_GetScriptPointer
 	ld a, [wdc18]
 	and a
 	jr nz, .ok
 	ld hl, wdc17
 	inc [hl]
 .ok
-	ld a, 1
+	ld a, PHONE_MOM
 	ld [wCurrentCaller], a
-	ld bc, wd03f
+	ld bc, EngineBuffer2
 	ld hl, 0
 	add hl, bc
 	ld [hl], 0
 	inc hl
 	ld [hl], 1
-	ld hl, 9
+	ld hl, wPhoneScriptPointer - EngineBuffer2
 	add hl, bc
-	ld a, $3f
+	ld a, BANK(Mom_GetScriptPointer)
 	ld [hli], a
 	ld a, e
 	ld [hli], a
@@ -114,7 +114,7 @@ Functionfd099: ; fd099
 
 MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6)
 	call GetItemFromMom
-	ld de, 3
+	ld de, 3 ; cost
 	add hl, de
 	ld a, [hli]
 	ld [hMoneyTemp], a
@@ -128,12 +128,12 @@ MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6)
 	ret
 
 
-Functionfd0c3: ; fd0c3
+Mom_GiveItemOrDoll: ; fd0c3
 	call GetItemFromMom
-	ld de, 6
+	ld de, 6 ; item type
 	add hl, de
 	ld a, [hli]
-	cp 1
+	cp MOM_ITEM
 	jr z, .not_doll
 	ld a, [hl]
 	ld c, a
@@ -145,7 +145,7 @@ Functionfd0c3: ; fd0c3
 .not_doll
 	ld a, [hl]
 	ld [CurItem], a
-	ld a, $1
+	ld a, 1
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, PCItems
 	call ReceiveItem
@@ -153,19 +153,19 @@ Functionfd0c3: ; fd0c3
 ; fd0eb
 
 
-Functionfd0eb: ; fd0eb (3f:50eb)
+Mom_GetScriptPointer: ; fd0eb (3f:50eb)
 	call GetItemFromMom
-	ld de, 6 ; field
+	ld de, 6 ; item type
 	add hl, de
 	ld a, [hli]
-	ld de, Script_MomBoughtItem
-	cp 1
+	ld de, .ItemScript
+	cp MOM_ITEM
 	ret z
-	ld de, Script_MomBoughtDoll
+	ld de, .DollScript
 	ret
 ; fd0fd (3f:50fd)
 
-Script_MomBoughtItem: ; 0xfd0fd
+.ItemScript: ; 0xfd0fd
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundAnItem
 	writetext _MomText_BoughtWithYourMoney
@@ -173,7 +173,7 @@ Script_MomBoughtItem: ; 0xfd0fd
 	end
 ; 0xfd10a
 
-Script_MomBoughtDoll: ; 0xfd10a
+.DollScript: ; 0xfd10a
 	writetext _MomText_HiHowAreYou
 	writetext _MomText_FoundADoll
 	writetext _MomText_BoughtWithYourMoney
@@ -188,7 +188,7 @@ GetItemFromMom: ; fd117
 	jr z, .zero
 	dec a
 	ld de, MomItems_1
-	jr .incave
+	jr .GetFromList1
 
 .zero
 	ld a, [wdc17]
@@ -199,7 +199,7 @@ GetItemFromMom: ; fd117
 .ok
 	ld de, MomItems_2
 
-.incave
+.GetFromList1
 	ld l, a
 	ld h, 0
 rept 3 ; multiply hl by 8
@@ -223,8 +223,6 @@ MomItems_1: ; fd136
 	momitem      0,   180, MOM_ITEM, POKE_BALL
 	momitem      0,   450, MOM_ITEM, ESCAPE_ROPE
 	momitem      0,   500, MOM_ITEM, GREAT_BALL
-; fd15e
-
 MomItems_2: ; fd15e
 	momitem    900,   600, MOM_ITEM, SUPER_POTION
 	momitem   4000,   270, MOM_ITEM, REPEL
diff --git a/event/move_deleter.asm b/event/move_deleter.asm
index 8c4d954ab..ba52b2b3a 100644
--- a/event/move_deleter.asm
+++ b/event/move_deleter.asm
@@ -22,7 +22,7 @@ MoveDeletion:
 	call LoadStandardMenuDataHeader
 	callba ChooseMoveToDelete
 	push af
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	pop af
 	jr c, .asm_2c5c3
 	ld a, [wMenuCursorY]
diff --git a/event/photo.asm b/event/photo.asm
index b35b38e04..c023e8d2b 100755
--- a/event/photo.asm
+++ b/event/photo.asm
@@ -249,7 +249,7 @@ PhotoStudio: ; 16dc7
 	call PrintText
 	call DisableSpriteUpdates
 	callba PrintPartymon
-	call Function2b74
+	call ReturnToMapWithSpeechTextbox
 	ld a, [hPrinter]
 	and a
 	jr nz, .cancel