merge with newest update

2025-09-08 08:13:02 -07:00 · 2015-10-26 03:26:53 +01:00
parent 3b9a3cc3be 0d17d4a758
commit 9a9cb38e39
446 changed files with 17108 additions and 16475 deletions
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -83,7 +83,7 @@ Function8aa4: ; 8aa4
 	push bc
 	ld hl, PalPacket_9ce6
 	ld de, wcda9
-	ld bc, $0010
+	ld bc, PalPacket_9cf6 - PalPacket_9ce6
 	call CopyBytes
 	pop bc
 	pop de
@@ -105,7 +105,7 @@ Function8aa4: ; 8aa4

 Function8ad1: ; 8ad1
 	ld hl, PalPacket_9c56 + 1
-	call Function9610
+	call CopyFourPalettes
 	call Function971a
 	call Function9699
 	ret
@@ -196,8 +196,8 @@ Function8b4d: ; 8b4d
 .asm_8b5c
 	ld de, Unkn2Pals
 	ld a, $3b
-	call Function9625
-	jp Function9630
+	call GetAthPalletFromPalettes9df6
+	jp LoadHLPaletteIntoDE
 ; 8b67

 Function8b67: ; 8b67
@@ -212,8 +212,8 @@ Function8b67: ; 8b67
 .asm_8b76
 	ld de, Unkn2Pals
 	ld a, $3c
-	call Function9625
-	jp Function9630
+	call GetAthPalletFromPalettes9df6
+	jp LoadHLPaletteIntoDE
 ; 8b81

 Function8b81: ; 8b81
@@ -309,7 +309,7 @@ Function8bec: ; 8bec
 .asm_8c0b
 	ld b, $0
 	add hl, bc
-	ld bc, $0604
+	lb bc, 6, 4
 	ld a, [EnemySafeguardCount]
 	and $3
 	call Function9663
@@ -386,7 +386,7 @@ endr
 	jr .asm_8c7b

 .asm_8c82
-	ld bc, $0208
+	lb bc, 2, 8
 	ld a, e
 	call Function9663
 	ret
@@ -520,7 +520,7 @@ INCLUDE "predef/cgb.asm"
 Function95f0: ; 95f0
 	ld hl, Palette_9608
 	ld de, Unkn1Pals
-	ld bc, $0008
+	ld bc, 8
 	ld a, $5
 	call FarCopyWRAM
 	call Function96a4
@@ -537,28 +537,29 @@ Palette_9608: ; 9608
 ; 9610


-Function9610: ; 9610
+CopyFourPalettes: ; 9610
 	ld de, Unkn1Pals
 	ld c, $4

-Function9615: ; 9615
+CopyPalettes: ; 9615
+.loop
 	push bc
 	ld a, [hli]
 	push hl
-	call Function9625
-	call Function9630
+	call GetAthPalletFromPalettes9df6
+	call LoadHLPaletteIntoDE
 	pop hl
 	inc hl
 	pop bc
 	dec c
-	jr nz, Function9615
+	jr nz, .loop
 	ret
 ; 9625

-Function9625: ; 9625
+GetAthPalletFromPalettes9df6: ; 9625
 	ld l, a
 	ld h, $0
-rept 3
+rept 3 ; multiply by 8
 	add hl, hl
 endr
 	ld bc, Palettes_9df6
@@ -566,18 +567,18 @@ endr
 	ret
 ; 9630

-Function9630: ; 9630
+LoadHLPaletteIntoDE: ; 9630
 	ld a, [rSVBK]
 	push af
 	ld a, $5
 	ld [rSVBK], a
 	ld c, $8
-.asm_9639
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_9639
+	jr nz, .loop
 	pop af
 	ld [rSVBK], a
 	ret
@@ -595,12 +596,12 @@ Function9643: ; 9643
 	ld [de], a
 	inc de
 	ld c, $4
-.asm_9654
+.loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .asm_9654
+	jr nz, .loop
 	xor a
 	ld [de], a
 	inc de
@@ -612,19 +613,19 @@ Function9643: ; 9643
 ; 9663

 Function9663: ; 9663
-.asm_9663
+.row
 	push bc
 	push hl
-.asm_9665
+.col
 	ld [hli], a
 	dec c
-	jr nz, .asm_9665
+	jr nz, .col
 	pop hl
-	ld bc, $0014
+	ld bc, SCREEN_WIDTH
 	add hl, bc
 	pop bc
 	dec b
-	jr nz, .asm_9663
+	jr nz, .row
 	ret
 ; 9673

@@ -743,7 +744,7 @@ Function96f3: ; 96f3
 	jr .asm_970b

 .asm_9712
-	ld bc, $0208
+	lb bc, 2, 8
 	ld a, e
 	call Function9663
 	ret
@@ -784,16 +785,16 @@ Function973a: ; 973a
 Function974b: ; 974b
 	and a
 	jp nz, Function97f9
-	ld a, [wd45b]
+	ld a, [wPlayerSpriteSetupFlags]
 	bit 2, a
-	jr nz, .asm_9760
+	jr nz, .male
 	ld a, [PlayerGender]
 	and a
-	jr z, .asm_9760
+	jr z, .male
 	ld hl, KrisPalette
 	ret

-.asm_9760
+.male
 	ld hl, PlayerPalette
 	ret
 ; 9764
@@ -876,21 +877,21 @@ Function97cc: ; 97cc
 	ld a, $90
 	ld [rOBPI], a
 	ld a, $1c
-	call Function9625
+	call GetAthPalletFromPalettes9df6
 	call Function97e5
 	ld a, $21
-	call Function9625
+	call GetAthPalletFromPalettes9df6
 	call Function97e5
 	ret
 ; 97e5

 Function97e5: ; 97e5
 	ld c, $8
-.asm_97e7
+.loop
 	ld a, [hli]
 	ld [rOBPD], a
 	dec c
-	jr nz, .asm_97e7
+	jr nz, .loop
 	ret
 ; 97ee

@@ -935,32 +936,32 @@ Function981a: ; 981a
 	and $7
 	ret z
 	ld b, a
-.asm_981f
+.loop
 	push bc
 	xor a
 	ld [rJOYP], a
 	ld a, $30
 	ld [rJOYP], a
 	ld b, $10
-.asm_9829
+.loop2
 	ld e, $8
 	ld a, [hli]
 	ld d, a
-.asm_982d
+.loop3
 	bit 0, d
 	ld a, $10
-	jr nz, .asm_9835
+	jr nz, .okay
 	ld a, $20

-.asm_9835
+.okay
 	ld [rJOYP], a
 	ld a, $30
 	ld [rJOYP], a
 	rr d
 	dec e
-	jr nz, .asm_982d
+	jr nz, .loop3
 	dec b
-	jr nz, .asm_9829
+	jr nz, .loop2
 	ld a, $20
 	ld [rJOYP], a
 	ld a, $30
@@ -968,7 +969,7 @@ Function981a: ; 981a
 	call Function9a7a
 	pop bc
 	dec b
-	jr nz, .asm_981f
+	jr nz, .loop
 	ret
 ; 9853

--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -124,7 +124,7 @@ Function109847:: ; 109847
 	jr z, .asm_10984f
 	ld a, $40
 .asm_10984f
-	ld [wcf63], a
+	ld [wJumptableIndex], a

 	ld a, [rSVBK]
 	push af
@@ -148,17 +148,17 @@ Function109847:: ; 109847
 	jr nz, .asm_10986a

 	ld de, CreditsBorderGFX
-	ld hl, $9200
+	ld hl, VTiles2 tile $20
 	lb bc, BANK(CreditsBorderGFX), $09
 	call Request2bpp

 	ld de, CopyrightGFX
-	ld hl, $9600
+	ld hl, VTiles2 tile $60
 	lb bc, BANK(CopyrightGFX), $1d
 	call Request2bpp

 	ld de, TheEndGFX
-	ld hl, $9400
+	ld hl, VTiles2 tile $40
 	lb bc, BANK(TheEndGFX), $10
 	call Request2bpp

@@ -193,7 +193,7 @@ Function109847:: ; 109847
 	ld a, $5
 	ld [hVBlank], a
 	ld a, $1
-	ld [$ffaa], a
+	ld [hInMenu], a
 	xor a
 	ld [hBGMapMode], a
 	ld [CreditsPos], a
@@ -225,7 +225,7 @@ Function1098fd: ; 1098fd
 	ld a, [hJoypadDown]
 	and $1
 	ret z
-	ld a, [wcf63]
+	ld a, [wJumptableIndex]
 	bit 7, a
 	ret
 ; 109908
@@ -234,7 +234,7 @@ Function109908: ; 109908
 	ld a, [hJoypadDown]
 	and $2
 	ret z
-	ld a, [wcf63]
+	ld a, [wJumptableIndex]
 	bit 6, a
 	ret z
 	ld hl, CreditsPos
@@ -255,7 +255,7 @@ Function109908: ; 109908
 ; 109926

 Function109926: ; 109926
-	ld a, [wcf63]
+	ld a, [wJumptableIndex]
 	and $f
 	ld e, a
 	ld d, 0
@@ -287,12 +287,12 @@ Jumptable_109937: ; 109937 (42:5937)


 Function109951: ; 109951 (42:5951)
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	inc [hl]
 	ret

 Function109956: ; 109956 (42:5956)
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	ld a, [hl]
 	and $f0
 	ld [hl], a
@@ -348,7 +348,7 @@ Function1099a3: ; 1099a3 (42:59a3)


 ParseCredits: ; 1099aa
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	bit 7, [hl]
 	jp nz, .done
 	
@@ -488,7 +488,7 @@ endr
 	
 .end
 ; Stop execution.
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	set 7, [hl]
 	ld a, $20
 	ld [MusicFade], a
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -1,198 +1,200 @@
 ; All locations are in WRAM bank 1.
-
+engine_flag: MACRO
+	dwb \1, 1 << \2
+ENDM
 	; location, bit

 	; pokegear
-	dwb wPokegearFlags, %00000010 ; radio card       ; $0
-	dwb wPokegearFlags, %00000001 ; map card
-	dwb wPokegearFlags, %00000100 ; phone card
-	dwb wPokegearFlags, %00001000 ; expn card
-	dwb wPokegearFlags, %10000000 ; on/off
+	engine_flag wPokegearFlags, 1 ; radio card       ; $0
+	engine_flag wPokegearFlags, 0 ; map card
+	engine_flag wPokegearFlags, 2 ; phone card
+	engine_flag wPokegearFlags, 3 ; expn card
+	engine_flag wPokegearFlags, 7 ; on/off

-	;   wDaycareMan, %10000000 ; daycare 1 on
-	dwb wDaycareMan, %01000000 ; monster 1 and 2 are compatible
-	;   wDaycareMan, %00100000 ; egg is ready
-	dwb wDaycareMan, %00000001 ; monster 1 in daycare
+	;   wDaycareMan, 7 ; daycare 1 on
+	engine_flag wDaycareMan, 6 ; monster 1 and 2 are compatible
+	;   wDaycareMan, 5 ; egg is ready
+	engine_flag wDaycareMan, 0 ; monster 1 in daycare

-	;   wDaycareLady, %10000000 = daycare 2 on
-	dwb wDaycareLady, %00000001 ; monster 2 in daycare
+	;   wDaycareLady, 7 = daycare 2 on
+	engine_flag wDaycareLady, 0 ; monster 2 in daycare

-	dwb wMomSavingMoney, %00000001 ; mom saving money ; $8
-	dwb wMomSavingMoney, %10000000 ; dst
+	engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
+	engine_flag wMomSavingMoney, 7 ; dst

-	dwb wdc39, %00000001
+	engine_flag wdc39, 0

-	dwb StatusFlags, %00000001 ; pokedex
-	dwb StatusFlags, %00000010 ; unown dex
-	dwb StatusFlags, %00001000 ; pokerus
-	dwb StatusFlags, %00010000 ; rocket signal on ch20
-	dwb StatusFlags, %01000000 ; credits skip
-	dwb StatusFlags, %10000000 ; bug contest on   ; $10
-	dwb StatusFlags2, %00000100 ; bug contest timer
-	dwb StatusFlags2, %00000010
-	dwb StatusFlags2, %00000001 ; rockets in radio tower
-	dwb StatusFlags2, %00010000 ; bike shop call enabled (1024 bike steps reqd)
-	dwb StatusFlags2, %00100000 ; give pokerus; berry -> berry juice when trading?
-	dwb StatusFlags2, %01000000
-	dwb StatusFlags2, %10000000 ; rockets in mahogany
+	engine_flag StatusFlags, 0 ; pokedex
+	engine_flag StatusFlags, 1 ; unown dex
+	engine_flag StatusFlags, 3 ; pokerus
+	engine_flag StatusFlags, 4 ; rocket signal on ch20
+	engine_flag StatusFlags, 6 ; credits skip
+	engine_flag StatusFlags, 7 ; bug contest on   ; $10
+	engine_flag StatusFlags2, 2 ; bug contest timer
+	engine_flag StatusFlags2, 1
+	engine_flag StatusFlags2, 0 ; rockets in radio tower
+	engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
+	engine_flag StatusFlags2, 5 ; give pokerus
+	engine_flag StatusFlags2, 6 ; berry -> berry juice when trading?
+	engine_flag StatusFlags2, 7 ; rockets in mahogany

-	dwb BikeFlags, %00000001 ; strength active  ; $18
-	dwb BikeFlags, %00000010 ; always on bike (cant surf)
-	dwb BikeFlags, %00000100 ; downhill (cycling road)
+	engine_flag BikeFlags, 0 ; strength active  ; $18
+	engine_flag BikeFlags, 1 ; always on bike (cant surf)
+	engine_flag BikeFlags, 2 ; downhill (cycling road)

-	dwb JohtoBadges, %00000001 ; zephyrbadge
-	dwb JohtoBadges, %00000010 ; hivebadge
-	dwb JohtoBadges, %00000100 ; plainbadge
-	dwb JohtoBadges, %00001000 ; fogbadge
-	dwb JohtoBadges, %00010000 ; mineralbadge
-	dwb JohtoBadges, %00100000 ; stormbadge ; $20
-	dwb JohtoBadges, %01000000 ; glacierbadge
-	dwb JohtoBadges, %10000000 ; risingbadge
+	engine_flag JohtoBadges, 0 ; zephyrbadge
+	engine_flag JohtoBadges, 1 ; hivebadge
+	engine_flag JohtoBadges, 2 ; plainbadge
+	engine_flag JohtoBadges, 3 ; fogbadge
+	engine_flag JohtoBadges, 4 ; mineralbadge
+	engine_flag JohtoBadges, 5 ; stormbadge ; $20
+	engine_flag JohtoBadges, 6 ; glacierbadge
+	engine_flag JohtoBadges, 7 ; risingbadge

-	dwb KantoBadges, %00000001 ; boulderbadge
-	dwb KantoBadges, %00000010 ; cascadebadge
-	dwb KantoBadges, %00000100 ; thunderbadge
-	dwb KantoBadges, %00001000 ; rainbowbadge
-	dwb KantoBadges, %00010000 ; soulbadge
-	dwb KantoBadges, %00100000 ; marshbadge ; $28
-	dwb KantoBadges, %01000000 ; volcanobadge
-	dwb KantoBadges, %10000000 ; earthbadge
+	engine_flag KantoBadges, 0 ; boulderbadge
+	engine_flag KantoBadges, 1 ; cascadebadge
+	engine_flag KantoBadges, 2 ; thunderbadge
+	engine_flag KantoBadges, 3 ; rainbowbadge
+	engine_flag KantoBadges, 4 ; soulbadge
+	engine_flag KantoBadges, 5 ; marshbadge ; $28
+	engine_flag KantoBadges, 6 ; volcanobadge
+	engine_flag KantoBadges, 7 ; earthbadge

 	; unown sets
-	dwb UnlockedUnowns, %00000001 ; 1
-	dwb UnlockedUnowns, %00000010 ; 2
-	dwb UnlockedUnowns, %00000100 ; 3
-	dwb UnlockedUnowns, %00001000 ; 4
-	dwb UnlockedUnowns, %00010000 ; 5
-	dwb UnlockedUnowns, %00100000 ; 6       ; $30
-	dwb UnlockedUnowns, %01000000 ; 7
-	dwb UnlockedUnowns, %10000000 ; 8
+	engine_flag UnlockedUnowns, 0 ; 1
+	engine_flag UnlockedUnowns, 1 ; 2
+	engine_flag UnlockedUnowns, 2 ; 3
+	engine_flag UnlockedUnowns, 3 ; 4
+	engine_flag UnlockedUnowns, 4 ; 5
+	engine_flag UnlockedUnowns, 5 ; 6       ; $30
+	engine_flag UnlockedUnowns, 6 ; 7
+	engine_flag UnlockedUnowns, 7 ; 8

 	; fly
-	dwb VisitedSpawns, %00000001 ; your house
-	dwb VisitedSpawns, %00000010 ; viridian pokecenter
-	dwb VisitedSpawns, %00000100 ; pallet
-	dwb VisitedSpawns, %00001000 ; viridian
-	dwb VisitedSpawns, %00010000 ; pewter
-	dwb VisitedSpawns, %00100000 ; cerulean ; $38
-	dwb VisitedSpawns, %01000000 ; rock tunnel
-	dwb VisitedSpawns, %10000000 ; vermilion
-	dwb VisitedSpawns + 1, %00000001 ; lavender
-	dwb VisitedSpawns + 1, %00000010 ; saffron
-	dwb VisitedSpawns + 1, %00000100 ; celadon
-	dwb VisitedSpawns + 1, %00001000 ; fuchsia
-	dwb VisitedSpawns + 1, %00010000 ; cinnabar
-	dwb VisitedSpawns + 1, %00100000 ; indigo plateau ; $40
-	dwb VisitedSpawns + 1, %01000000 ; new bark
-	dwb VisitedSpawns + 1, %10000000 ; cherrygrove
-	dwb VisitedSpawns + 2, %00000001 ; violet
-	dwb VisitedSpawns + 2, %00000100 ; azalea
-	dwb VisitedSpawns + 2, %00001000 ; cianwood
-	dwb VisitedSpawns + 2, %00010000 ; goldenrod
-	dwb VisitedSpawns + 2, %00100000 ; olivine
-	dwb VisitedSpawns + 2, %01000000 ; ecruteak  ; $48
-	dwb VisitedSpawns + 2, %10000000 ; mahogany
-	dwb VisitedSpawns + 3, %00000001 ; lake of rage
-	dwb VisitedSpawns + 3, %00000010 ; blackthorn
-	dwb VisitedSpawns + 3, %00000100 ; silver cave
-	dwb VisitedSpawns + 3, %00010000 ; unused
+	engine_flag VisitedSpawns, 0 ; your house
+	engine_flag VisitedSpawns, 1 ; viridian pokecenter
+	engine_flag VisitedSpawns, 2 ; pallet
+	engine_flag VisitedSpawns, 3 ; viridian
+	engine_flag VisitedSpawns, 4 ; pewter
+	engine_flag VisitedSpawns, 5 ; cerulean ; $38
+	engine_flag VisitedSpawns, 6 ; rock tunnel
+	engine_flag VisitedSpawns, 7 ; vermilion
+	engine_flag VisitedSpawns + 1, 0 ; lavender
+	engine_flag VisitedSpawns + 1, 1 ; saffron
+	engine_flag VisitedSpawns + 1, 2 ; celadon
+	engine_flag VisitedSpawns + 1, 3 ; fuchsia
+	engine_flag VisitedSpawns + 1, 4 ; cinnabar
+	engine_flag VisitedSpawns + 1, 5 ; indigo plateau ; $40
+	engine_flag VisitedSpawns + 1, 6 ; new bark
+	engine_flag VisitedSpawns + 1, 7 ; cherrygrove
+	engine_flag VisitedSpawns + 2, 0 ; violet
+	engine_flag VisitedSpawns + 2, 2 ; azalea
+	engine_flag VisitedSpawns + 2, 3 ; cianwood
+	engine_flag VisitedSpawns + 2, 4 ; goldenrod
+	engine_flag VisitedSpawns + 2, 5 ; olivine
+	engine_flag VisitedSpawns + 2, 6 ; ecruteak  ; $48
+	engine_flag VisitedSpawns + 2, 7 ; mahogany
+	engine_flag VisitedSpawns + 3, 0 ; lake of rage
+	engine_flag VisitedSpawns + 3, 1 ; blackthorn
+	engine_flag VisitedSpawns + 3, 2 ; silver cave
+	engine_flag VisitedSpawns + 3, 4 ; unused

-	dwb wLuckyNumberShowFlag, %00000001 ; lucky number show
-	dwb StatusFlags2, %00001000
+	engine_flag wLuckyNumberShowFlag, 0 ; lucky number show
+	engine_flag StatusFlags2, 3 ; ????

-	dwb DailyFlags, %00000001 ; kurt making balls  ; $50
-	dwb DailyFlags, %00000010
-	dwb DailyFlags, %00000100 ; special wilddata?
-	dwb DailyFlags, %00001000 ; time capsule (24h wait)
-	dwb DailyFlags, %00010000 ; all fruit trees
-	dwb DailyFlags, %00100000 ; shuckle given
-	dwb DailyFlags, %01000000 ; goldenrod underground merchant closed
-	dwb DailyFlags, %10000000 ; fought in trainer hall today
+	engine_flag DailyFlags, 0 ; kurt making balls  ; $50
+	engine_flag DailyFlags, 1 ; ????
+	engine_flag DailyFlags, 2 ; special wilddata?
+	engine_flag DailyFlags, 3 ; time capsule (24h wait)
+	engine_flag DailyFlags, 4 ; all fruit trees
+	engine_flag DailyFlags, 5 ; shuckle given
+	engine_flag DailyFlags, 6 ; goldenrod underground merchant closed
+	engine_flag DailyFlags, 7 ; fought in trainer hall today

-	dwb WeeklyFlags, %00000001 ; mt moon square clefairy  ; $58
-	dwb WeeklyFlags, %00000010 ; union cave lapras
-	dwb WeeklyFlags, %00000100 ; goldenrod underground haircut used
-	dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
-	dwb WeeklyFlags, %00010000 ; tea in blues house
-	dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
-	dwb WeeklyFlags, %01000000 ; move tutor
-	dwb WeeklyFlags, %10000000 ; buenas password
+	engine_flag WeeklyFlags, 0 ; mt moon square clefairy  ; $58
+	engine_flag WeeklyFlags, 1 ; union cave lapras
+	engine_flag WeeklyFlags, 2 ; goldenrod underground haircut used
+	engine_flag WeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07
+	engine_flag WeeklyFlags, 4 ; tea in blues house
+	engine_flag WeeklyFlags, 5 ; indigo plateau rival fight
+	engine_flag WeeklyFlags, 6 ; move tutor
+	engine_flag WeeklyFlags, 7 ; buenas password

-	dwb SwarmFlags, %00000001 ; $60
-	dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
+	engine_flag SwarmFlags, 0 ; $60
+	engine_flag SwarmFlags, 1 ; goldenrod dept store sale is on

-	dwb GameTimerPause, %10000000 ; $62
+	engine_flag GameTimerPause, 7 ; $62

-	dwb PlayerGender, %00000001 ; player is female
+	engine_flag PlayerGender, 0 ; player is female

-	dwb wdbf3, %00000100 ; have gs ball after kurt examined it
+	engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it

 	; rematches
-	dwb wDailyRematchFlags, %00000001 ; jack
-	dwb wDailyRematchFlags, %00000010 ; huey
-	dwb wDailyRematchFlags, %00000100 ; gaven
-	dwb wDailyRematchFlags, %00001000 ; beth  ; $68
-	dwb wDailyRematchFlags, %00010000 ; jose
-	dwb wDailyRematchFlags, %00100000 ; reena
-	dwb wDailyRematchFlags, %01000000 ; joey
-	dwb wDailyRematchFlags, %10000000 ; wade
-	dwb wDailyRematchFlags + 1, %00000001 ; ralph
-	dwb wDailyRematchFlags + 1, %00000010 ; liz
-	dwb wDailyRematchFlags + 1, %00000100 ; anthony
-	dwb wDailyRematchFlags + 1, %00001000 ; todd  ; $70
-	dwb wDailyRematchFlags + 1, %00010000 ; gina
-	dwb wDailyRematchFlags + 1, %00100000 ; arnie
-	dwb wDailyRematchFlags + 1, %01000000 ; alan
-	dwb wDailyRematchFlags + 1, %10000000 ; dana
-	dwb wDailyRematchFlags + 2, %00000001 ; chad
-	dwb wDailyRematchFlags + 2, %00000010 ; tully
-	dwb wDailyRematchFlags + 2, %00000100 ; brent
-	dwb wDailyRematchFlags + 2, %00001000 ; tiffany  ; $78
-	dwb wDailyRematchFlags + 2, %00010000 ; vance
-	dwb wDailyRematchFlags + 2, %00100000 ; wilton
-	dwb wDailyRematchFlags + 2, %01000000 ; parry
-	dwb wDailyRematchFlags + 2, %10000000 ; erin
+	engine_flag wDailyRematchFlags, 0 ; jack
+	engine_flag wDailyRematchFlags, 1 ; huey
+	engine_flag wDailyRematchFlags, 2 ; gaven
+	engine_flag wDailyRematchFlags, 3 ; beth  ; $68
+	engine_flag wDailyRematchFlags, 4 ; jose
+	engine_flag wDailyRematchFlags, 5 ; reena
+	engine_flag wDailyRematchFlags, 6 ; joey
+	engine_flag wDailyRematchFlags, 7 ; wade
+	engine_flag wDailyRematchFlags + 1, 0 ; ralph
+	engine_flag wDailyRematchFlags + 1, 1 ; liz
+	engine_flag wDailyRematchFlags + 1, 2 ; anthony
+	engine_flag wDailyRematchFlags + 1, 3 ; todd  ; $70
+	engine_flag wDailyRematchFlags + 1, 4 ; gina
+	engine_flag wDailyRematchFlags + 1, 5 ; arnie
+	engine_flag wDailyRematchFlags + 1, 6 ; alan
+	engine_flag wDailyRematchFlags + 1, 7 ; dana
+	engine_flag wDailyRematchFlags + 2, 0 ; chad
+	engine_flag wDailyRematchFlags + 2, 1 ; tully
+	engine_flag wDailyRematchFlags + 2, 2 ; brent
+	engine_flag wDailyRematchFlags + 2, 3 ; tiffany  ; $78
+	engine_flag wDailyRematchFlags + 2, 4 ; vance
+	engine_flag wDailyRematchFlags + 2, 5 ; wilton
+	engine_flag wDailyRematchFlags + 2, 6 ; parry
+	engine_flag wDailyRematchFlags + 2, 7 ; erin

-	dwb wDailyPhoneItemFlags, %00000001 ; beverly has nugget
-	dwb wDailyPhoneItemFlags, %00000010 ; jose has star piece
-	dwb wDailyPhoneItemFlags, %00000100 ; wade has item (see bittable1 $032b-e)
-	dwb wDailyPhoneItemFlags, %00001000 ; gina has leaf stone  ; $80
-	dwb wDailyPhoneItemFlags, %00010000 ; alan has fire stone
-	dwb wDailyPhoneItemFlags, %00100000 ; liz has thunderstone
-	dwb wDailyPhoneItemFlags, %01000000 ; derek has nugget
-	dwb wDailyPhoneItemFlags, %10000000 ; tully has water stone
+	engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget
+	engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece
+	engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see bittable1 $032b-e)
+	engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone  ; $80
+	engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone
+	engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone
+	engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget
+	engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone

-	dwb wDailyPhoneItemFlags + 1, %00000001 ; tiffany has pink bow
-	dwb wDailyPhoneItemFlags + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
+	engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow
+	engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see bittable1 $032f-31)

-	dwb wDailyPhoneTimeOfDayFlags, %00000001
-	dwb wDailyPhoneTimeOfDayFlags, %00000010  ; $88
-	dwb wDailyPhoneTimeOfDayFlags, %00000100
-	dwb wDailyPhoneTimeOfDayFlags, %00001000
-	dwb wDailyPhoneTimeOfDayFlags, %00010000
-	dwb wDailyPhoneTimeOfDayFlags, %00100000
-	dwb wDailyPhoneTimeOfDayFlags, %01000000
-	dwb wDailyPhoneTimeOfDayFlags, %10000000
+	engine_flag wDailyPhoneTimeOfDayFlags, 0
+	engine_flag wDailyPhoneTimeOfDayFlags, 1  ; $88
+	engine_flag wDailyPhoneTimeOfDayFlags, 2
+	engine_flag wDailyPhoneTimeOfDayFlags, 3
+	engine_flag wDailyPhoneTimeOfDayFlags, 4
+	engine_flag wDailyPhoneTimeOfDayFlags, 5
+	engine_flag wDailyPhoneTimeOfDayFlags, 6
+	engine_flag wDailyPhoneTimeOfDayFlags, 7

-	dwb wDailyPhoneTimeOfDayFlags + 1, %00000001
-	dwb wDailyPhoneTimeOfDayFlags + 1, %00000010  ; $90
-	dwb wDailyPhoneTimeOfDayFlags + 1, %00000100
-	dwb wDailyPhoneTimeOfDayFlags + 1, %00001000
-	dwb wDailyPhoneTimeOfDayFlags + 1, %00010000
-	dwb wDailyPhoneTimeOfDayFlags + 1, %00100000
-	dwb wDailyPhoneTimeOfDayFlags + 1, %01000000
-	dwb wDailyPhoneTimeOfDayFlags + 1, %10000000
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 0
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 1  ; $90
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 2
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 3
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 4
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 5
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 6
+	engine_flag wDailyPhoneTimeOfDayFlags + 1, 7

-	dwb wDailyPhoneTimeOfDayFlags + 2, %00000001
-	dwb wDailyPhoneTimeOfDayFlags + 2, %00000010  ; $98
-	dwb wDailyPhoneTimeOfDayFlags + 2, %00000100
-	dwb wDailyPhoneTimeOfDayFlags + 2, %00001000
-	dwb wDailyPhoneTimeOfDayFlags + 2, %00010000
-	dwb wDailyPhoneTimeOfDayFlags + 2, %00100000
-	dwb wDailyPhoneTimeOfDayFlags + 2, %01000000
-	dwb wDailyPhoneTimeOfDayFlags + 2, %10000000
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 0
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 1  ; $98
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 2
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 3
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 4
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 5
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 6
+	engine_flag wDailyPhoneTimeOfDayFlags + 2, 7

-	dwb wd45b, %00000100 ; female player has been transformed into male
+	engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male

-	dwb SwarmFlags, %00000100 ; dunsparce swarm   ; $a0
-	dwb SwarmFlags, %00001000 ; yanma swarm
+	engine_flag SwarmFlags, 2 ; dunsparce swarm   ; $a0
+	engine_flag SwarmFlags, 3 ; yanma swarm
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -123,7 +123,7 @@ StartMap: ; 96724
 	ld hl, MapStatus
 	ld bc, $3e ; 62
 	call ByteFill
-	callba Function113e5
+	callba InitCallReceiveDelay
 	call ClearJoypad
 	; fallthrough
 ; 9673e
@@ -138,19 +138,19 @@ EnterMap: ; 9673e
 	call ClearAllScriptFlags3

 	ld a, [hMapEntryMethod]
-	cp $f7
+	cp MAPSETUP_07
 	jr nz, .dontset
 	call SetAll_ScriptFlags3
 .dontset

 	ld a, [hMapEntryMethod]
-	cp $f3
+	cp MAPSETUP_RELOADMAP
 	jr nz, .dontresetpoison
 	xor a
 	ld [PoisonStepCount], a
 .dontresetpoison

-	xor a
+	xor a ; end map entry
 	ld [hMapEntryMethod], a
 	ld a, 2 ; HandleMap
 	ld [MapStatus], a
@@ -285,12 +285,12 @@ Function96812: ; 96812
 PlayerEvents: ; 9681f

 	xor a
-
+; If there's already a player event, don't interrupt it.
 	ld a, [ScriptRunning]
 	and a
 	ret nz

-	call Function968e4
+	call Dummy_CheckScriptFlags3Bit5 ; This is a waste of time

 	call CheckTrainerBattle3
 	jr c, .ok
@@ -298,13 +298,13 @@ PlayerEvents: ; 9681f
 	call CheckTileEvent
 	jr c, .ok

-	call Function97c30
+	call RunMemScript
 	jr c, .ok

-	call Function968ec
+	call DoMapTrigger
 	jr c, .ok

-	call Function9693a
+	call CheckTimeEvents
 	jr c, .ok

 	call OWPlayerInput
@@ -320,7 +320,7 @@ PlayerEvents: ; 9681f
 	pop af

 	ld [ScriptRunning], a
-	call Function96beb
+	call DoPlayerEvent
 	ld a, [ScriptRunning]
 	cp 4
 	jr z, .ok2
@@ -361,7 +361,7 @@ CheckTileEvent: ; 96874
 	callba CheckMovingOffEdgeOfMap
 	jr c, .return4

-	call Function2238
+	call CheckWarpTile
 	jr c, .return6

 .bit2
@@ -436,11 +436,11 @@ SetUpFiveStepWildEncounterCooldown: ; 968d1
 	ret
 ; 968d7

-Function968d7: ; 968d7
+ret_968d7: ; 968d7
 	ret
-; 968d8
+;968d8

-Function968d8: ; 968d8
+SetMinTwoStepWildEncounterCooldown: ; 968d8
 	ld a, [wWildEncounterCooldown]
 	cp 2
 	ret nc
@@ -449,15 +449,15 @@ Function968d8: ; 968d8
 	ret
 ; 968e4

-Function968e4: ; 968e4
+Dummy_CheckScriptFlags3Bit5: ; 968e4
 	call CheckBit5_ScriptFlags3
 	ret z
-	call Function2f3e
+	call ret_2f3e
 	ret
 ; 968ec

-Function968ec: ; 968ec
-	ld a, [wdc07]
+DoMapTrigger: ; 968ec
+	ld a, [wCurrMapTriggerCount]
 	and a
 	jr z, .nope

@@ -468,7 +468,7 @@ Function968ec: ; 968ec

 	ld e, a
 	ld d, 0
-	ld hl, wdc07 + 1
+	ld hl, wCurrMapTriggerHeaderPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -505,23 +505,23 @@ endr
 	ret
 ; 9693a

-Function9693a: ; 9693a
-	ld a, [InLinkBattle]
+CheckTimeEvents: ; 9693a
+	ld a, [wLinkMode]
 	and a
 	jr nz, .nothing

 	ld hl, StatusFlags2
 	bit 2, [hl]
-	jr z, .asm_96951
+	jr z, .do_daily

-	callba Function114a4
-	jr c, .elevator
+	callba CheckBugContestTimer
+	jr c, .end_bug_contest
 	xor a
 	ret

-.asm_96951
-	callba Function11452
-	callba Function114e7
+.do_daily
+	callba CheckDailyResetTimer
+	callba CheckPokerusTrick
 	callba CheckPhoneCall
 	ret c

@@ -529,7 +529,7 @@ Function9693a: ; 9693a
 	xor a
 	ret

-.elevator
+.end_bug_contest
 	ld a, BANK(BugCatchingContestOverScript)
 	ld hl, BugCatchingContestOverScript
 	call CallScript
@@ -537,7 +537,7 @@ Function9693a: ; 9693a
 	ret
 ; 96970

-Function96970: ; 96970
+.unused ; 96970
 	ld a, 8
 	scf
 	ret
@@ -856,7 +856,7 @@ PlayerMovement: ; 96af0
 ; 96b10

 .seven ; 96b10
-	call Function968d7 ; empty
+	call ret_968d7 ; mobile
 	xor a
 	ld c, a
 	ret
@@ -898,7 +898,7 @@ PlayerMovement: ; 96af0

 CheckMenuOW: ; 96b30
 	xor a
-	ld [$ffa0], a
+	ld [hMenuReturn], a
 	ld [$ffa1], a
 	ld a, [hJoyPressed]

@@ -940,9 +940,9 @@ SelectMenuScript: ; 96b5f

 StartMenuCallback:
 SelectMenuCallback: ; 96b66
-	copybytetovar $ffa0
-	if_equal %10000000, .Script
-	if_equal -1, .Asm
+	copybytetovar hMenuReturn
+	if_equal HMENURETURN_SCRIPT, .Script
+	if_equal HMENURETURN_ASM, .Asm
 	end
 ; 96b72

@@ -957,76 +957,86 @@ SelectMenuCallback: ; 96b66


 CountStep: ; 96b79
-	ld a, [InLinkBattle]
+	; Don't count steps in link communication rooms.
+	ld a, [wLinkMode]
 	and a
 	jr nz, .done

-	callba Function90136
-	jr c, .setminus1
+	; If there is a special phone call, don't count the step.
+	callba CheckSpecialPhoneCall
+	jr c, .doscript

-	call Function96bd7
-	jr c, .setminus1
+	; If Repel wore off, don't count the step.
+	call DoRepelStep
+	jr c, .doscript

+	; Count the step for poison and total steps
 	ld hl, PoisonStepCount
 	inc [hl]
 	ld hl, StepCount
 	inc [hl]
-	jr nz, .asm_96b9c
+	; Every 256 steps, increase the happiness of all your Pokemon.
+	jr nz, .skip_happiness

 	callba StepHappiness

-.asm_96b9c
+.skip_happiness
+	; Every 256 steps, offset from the happiness incrementor by 128 steps,
+	; decrease the hatch counter of all your eggs until you reach the first
+	; one that is ready to hatch.
 	ld a, [StepCount]
 	cp $80
-	jr nz, .asm_96bab
+	jr nz, .skip_egg

-	callba Function16f3e
-	jr nz, .set8
+	callba DoEggStep
+	jr nz, .hatch

-.asm_96bab
+.skip_egg
+	; Increase the EXP of (both) DayCare Pokemon by 1.
 	callba DaycareStep

+	; Every four steps, deal damage to all Poisoned Pokemon
 	ld hl, PoisonStepCount
 	ld a, [hl]
 	cp 4
-	jr c, .poisoned
+	jr c, .skip_poison
 	ld [hl], 0

-	callba Function505da
-	jr c, .setminus1
+	callba DoPoisonStep
+	jr c, .doscript

-.poisoned
-	callba Function97db3
+.skip_poison
+	callba DoBikeStep

 .done
 	xor a
 	ret

-.setminus1
+.doscript
 	ld a, -1
 	scf
 	ret

-.set8
+.hatch
 	ld a, 8
 	scf
 	ret
 ; 96bd3


-Function96bd3: ; 96bd3
+.unreferenced: ; 96bd3
 	ld a, 7
 	scf
 	ret
 ; 96bd7

-Function96bd7: ; 96bd7
-	ld a, [RepelStepsLeft]
+DoRepelStep: ; 96bd7
+	ld a, [wRepelEffect]
 	and a
 	ret z

 	dec a
-	ld [RepelStepsLeft], a
+	ld [wRepelEffect], a
 	ret nz

 	ld a, BANK(RepelWoreOffScript)
@@ -1036,11 +1046,11 @@ Function96bd7: ; 96bd7
 	ret
 ; 96beb

-Function96beb: ; 96beb
+DoPlayerEvent: ; 96beb
 	ld a, [ScriptRunning]
 	and a
 	ret z
-	cp -1
+	cp -1 ; run script
 	ret z
 	cp 10
 	ret nc
@@ -1061,17 +1071,17 @@ endr
 ; 96c0c

 ScriptPointers96c0c: ; 96c0c
-	dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d
-	dbw BANK(SeenByTrainerScript), SeenByTrainerScript
-	dbw BANK(TalkToTrainerScript), TalkToTrainerScript
-	dbw BANK(FindItemInBallScript), FindItemInBallScript
-	dbw BANK(UnknownScript_0x96c4d), UnknownScript_0x96c4d
-	dbw BANK(WarpToNewMapScript), WarpToNewMapScript
-	dbw BANK(FallIntoMapScript), FallIntoMapScript
-	dbw BANK(UnknownScript_0x124c8), UnknownScript_0x124c8
-	dbw BANK(HatchEggScript), HatchEggScript
-	dbw BANK(UnknownScript_0x96c4f), UnknownScript_0x96c4f
-	dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d
+	dba Invalid_0x96c2d
+	dba SeenByTrainerScript
+	dba TalkToTrainerScript
+	dba FindItemInBallScript
+	dba UnknownScript_0x96c4d
+	dba WarpToNewMapScript
+	dba FallIntoMapScript
+	dba UnknownScript_0x124c8
+	dba HatchEggScript
+	dba UnknownScript_0x96c4f
+	dba Invalid_0x96c2d
 ; 96c2d

 Invalid_0x96c2d: ; 96c2d
@@ -1089,16 +1099,16 @@ HatchEggScript: ; 96c2f

 WarpToNewMapScript: ; 96c34
 	warpsound
-	newloadmap $f5
+	newloadmap MAPSETUP_05
 	end
 ; 96c38

 FallIntoMapScript: ; 96c38
-	newloadmap $f6
+	newloadmap MAPSETUP_06
 	playsound SFX_KINESIS
 	applymovement PLAYER, MovementData_0x96c48
 	playsound SFX_STRENGTH
-	scall UnknownScript_0x96c4a
+	scall LandAfterPitfallScript
 	end
 ; 96c48

@@ -1107,7 +1117,7 @@ MovementData_0x96c48: ; 96c48
 	step_end
 ; 96c4a

-UnknownScript_0x96c4a: ; 96c4a
+LandAfterPitfallScript: ; 96c4a
 	earthquake 16
 	end
 ; 96c4d
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -8,33 +8,39 @@ WarpToSpawnPoint:: ; 97c28
 	ret
 ; 97c30

-Function97c30:: ; 97c30
-	ld a, [wd45c]
+RunMemScript:: ; 97c30
+; If there is no script here, we don't need to be here.
+	ld a, [wMapReentryScriptQueueFlag]
 	and a
 	ret z
-	ld hl, wd45c + 2
+; Execute the script at (wMapReentryScriptBank):(wMapReentryScriptAddress).
+	ld hl, wMapReentryScriptAddress
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wd45c + 1]
+	ld a, [wMapReentryScriptBank]
 	call CallScript
 	scf
+; Clear the buffer for the next script.
 	push af
 	xor a
-	ld hl, wd45c
+	ld hl, wMapReentryScriptQueueFlag
 	ld bc, 8
 	call ByteFill
 	pop af
 	ret
 ; 97c4f

-Function97c4f:: ; 97c4f
-	ld hl, wd45c
+LoadScriptBDE:: ; 97c4f
+; If there's already a script here, don't overwrite.
+	ld hl, wMapReentryScriptQueueFlag
 	ld a, [hl]
 	and a
 	ret nz
+; Set the flag
 	ld [hl], 1
 	inc hl
+; Load the script pointer b:de into (wMapReentryScriptBank):(wMapReentryScriptAddress)
 	ld [hl], b
 	inc hl
 	ld [hl], e
@@ -262,46 +268,60 @@ ContestMons: ; 97d87
 	db -1, VENOMOTH,   30, 40
 ; 97db3

-Function97db3:: ; 97db3
+DoBikeStep:: ; 97db3
 	nop
 	nop
-	; fallthrough
-; 97db5
-
-Function97db5: ; 97db5
+	; If the bike shop owner doesn't have our number, or
+	; if we've already gotten the call, we don't have to
+	; be here.
 	ld hl, StatusFlags2
 	bit 4, [hl]
 	jr z, .NoCall
+
+	; If we're not on the bike, we don't have to be here.
 	ld a, [PlayerState]
-	cp 1
+	cp PLAYER_BIKE
 	jr nz, .NoCall
+
+	; If we're not in an area of phone service, we don't
+	; have to be here.
 	call GetMapHeaderPhoneServiceNybble
 	and a
 	jr nz, .NoCall
-	ld hl, wdca2
+
+	; Check the bike step count and check whether we've
+	; taken 65536 of them yet.
+	ld hl, wBikeStep
 	ld a, [hli]
 	ld d, a
 	ld e, [hl]
-	cp -1
-	jr nz, .asm_97dd8
+	cp 255
+	jr nz, .increment
 	ld a, e
-	cp -1
-	jr z, .asm_97ddc
+	cp 255
+	jr z, .dont_increment

-.asm_97dd8
+.increment
 	inc de
 	ld [hl], e
 	dec hl
 	ld [hl], d

-.asm_97ddc
+.dont_increment
+	; If we've taken at least 1024 steps, have the bike
+	;  shop owner try to call us.
 	ld a, d
-	cp $4
+	cp 1024 >> 8
 	jr c, .NoCall
+
+	; If a call has already been queued, don't overwrite
+	; that call.
 	ld a, [wSpecialPhoneCallID]
 	and a
 	jr nz, .NoCall
-	ld a, 6
+
+	; Queue the call.
+	ld a, SPECIALCALL_BIKESHOP
 	ld [wSpecialPhoneCallID], a
 	xor a
 	ld [wSpecialPhoneCallID + 1], a
@@ -488,7 +508,7 @@ Function97eb7: ; 97eb7
 ; 97eb8

 Function97eb8: ; 97eb8
-	call Function2f3e
+	call ret_2f3e
 	ret
 ; 97ebc

--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
 ; 4405f

 PickedFruitTree: ; 4405f
-	callba Function10609b ; empty function
+	callba MobileFn_10609b ; empty function
 	ld b, 1
 	jp GetFruitTreeFlag
 ; 4406a
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2196,7 +2196,7 @@ Function4ecd: ; 4ecd
 	add hl, bc
 	ld a, [hl]
 	ld b, a
-	callba Function807e
+	callba CopyDECoordsToMapObject
 	pop bc
 	ld hl, OBJECT_FLAGS
 	add hl, bc
@@ -3064,7 +3064,7 @@ Function579d: ; 579d
 ; 57bc

 Function57bc: ; 57bc
-	ld hl, wd45b
+	ld hl, wPlayerSpriteSetupFlags
 	bit 7, [hl]
 	jr nz, .ok
 	ret
@@ -3076,10 +3076,10 @@ Function57bc: ; 57bc
 ; 57ca

 Function57ca: ; 57ca
-	ld hl, wd45b
+	ld hl, wPlayerSpriteSetupFlags
 	bit 5, [hl]
 	ret z
-	ld a, [wd45b]
+	ld a, [wPlayerSpriteSetupFlags]
 	and 3
 rept 2
 	add a
@@ -3137,7 +3137,7 @@ Function5803:: ; 5803
 Function5815: ; 5815
 	call Function18de
 	ret c
-	ld a, [$ffb0]
+	ld a, [hConnectedMapWidth]
 	ld [wd4cd], a
 	ret
 ; 581f
@@ -3166,7 +3166,7 @@ Function582c: ; 582c
 	ld hl, OBJECT_09
 	add hl, bc
 	ld [hl], 0
-	ld a, [$ffb0]
+	ld a, [hConnectedMapWidth]
 	ld [wd4ce], a
 	ret
 ; 5847
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -31,57 +31,6 @@ MapSetupScripts: ; 15377
 	dw MapSetupScript12
 ; 1538f

-
-; Command descriptions from Condensation water's scripting compendium.
-	const_def
-	const map_lcd_on              ; 00 = Turn LCD on
-	const map_lcd_off             ; 01 = Turn LCD off
-	const map_sound_off           ; 02 = Turn speakers off
-	const map_music               ; 03 = Music check for current map/ special check for bug catcher contest
-	const map_start_music         ; 04 = Start map music anew
-	const map_fade_music          ; 05 = Music check for current map / special check for Bug Contest/ music with FadeOut (old) and FadeIn
-	const map_fade                ; 06 = Fade out music + screen
-	const map_bike_music          ; 07 = If HIRO is on bike = bike music, else play map music
-	const map_music_force         ; 08 = Play map music
-	const map_max_volume          ; 09 = Turn music to highest volume
-	const map_load_blocks         ; 0A = Write map data to MapRAM
-	const map_connection_blocks   ; 0B = Compute map’s connection pars and write into MapRAM
-	const map_save_screen         ; 0C = Write current part of map into temporary memory
-	const map_buffer_screen       ; 0D = Write current part of map into read-from memory
-	const map_load_graphics       ; 0E = Write tileset header to ram/ load tileset/ load sprite tiles/ load special tiles
-	const map_load_tileset_header ; 0F = Write tileset header to ram
-	const map_time_of_day         ; 10 = Compute time of day/ Update screen
-	const map_palettes            ; 11 = Load map palettes
-	const map_wildmons            ; 12 = Load probabilities for wild Pokémon battles
-	const map_sprites             ; 13 = Delete sprite data and draw new sprites
-	const map_change_callback     ; 14 = Check 2nd script header for 05 and 03 callbacks
-	const map_start_callback      ; 15 = Check 2nd script header for 03 callbacks
-	const map_load_objects        ; 16 = Analyze people data anew and check 2nd script header for 02 callbacks
-	const map_load_spawn          ; 17 = Writes arrival data for arrival by flying/Blackout from table 05:5319 to ram
-	const map_load_connection     ; 18 = Writes arrival data for entering a map by connection to ram
-	const map_load_warp           ; 19 = Write warp data to ram when entering warp
-	const map_attributes          ; 1A = Load complete map data (primary, secondary, event, script headers)
-	const map_attributes_2        ; 1B = Same as 1A, but some settings aren’t loaded new from the rom, such as hide function of the people events
-	const map_clear_bg_palettes   ; 1C = Fill palette data with FFFF (=white)
-	const map_fade_out_palettes   ; 1D = All BG pallet color are converted to 0|0 (Pal0, Col0), all sprite colors to x|0 (FadeOut)
-	const map_fade_in_palettes    ; 1E = Palette FadeIn
-	const map_anchor_screen       ; 1F = Compute position of upper left-most block visible on screen
-	const map_warp_face           ; 20 = Position computation when HIRO leaves a warp
-	const map_face_down           ; 21 = Set HIRO’s facing to “down”
-	const map_spawn_coord         ; 22 = Prepare HIRO data for arrival by flight
-	const map_player_coord        ; 23 = Compute HIRO x/y data anew
-	const map_prolong_sprites     ; 24 = Prolong old sprites before removing them
-	const map_delay_sprites       ; 25 = Delay rendering new sprites
-	const map_update_roam         ; 26 = Compute chances to meet Raikou, Entei or Suicune
-	const map_keep_roam           ; 27 = Recover chances to meet Raikou, Entei or Suicune
-	const map_fade_out_music      ; 28 = Temporarily stop music playing
-	const map_animations_on       ; 29 = Activate animations
-	const map_animations_off      ; 2A = Deactivate animations
-	const map_keep_palettes       ; 2B = Recover all palettes
-	const map_text_scroll_off     ; 2C = Turn off text scroll (for town name overlays)
-	const map_stop_script         ; 2D = Deactivate code prolonging
-
-
 MapSetupScript4: ; 1538f
 	db map_prolong_sprites

@@ -112,7 +61,7 @@ MapSetupScript1: ; 15392
 	db map_fade_in_palettes
 	db map_animations_on
 	db map_wildmons
-	db -1
+	db map_end_setup_script

 MapSetupScript11: ; 153a9
 	db map_load_spawn
@@ -136,7 +85,7 @@ MapSetupScript11: ; 153a9
 	db map_fade_in_palettes
 	db map_animations_on
 	db map_wildmons
-	db -1
+	db map_end_setup_script

 MapSetupScript7: ; 153bf
 	db map_animations_off
@@ -155,7 +104,7 @@ MapSetupScript7: ; 153bf
 	db map_wildmons
 	db map_update_roam
 	db map_animations_on
-	db -1
+	db map_end_setup_script

 MapSetupScript6: ; 153d0
 	db map_prolong_sprites
@@ -184,7 +133,7 @@ MapSetupScript9: ; 153d2
 	db map_animations_on
 	db map_wildmons
 	db map_update_roam
-	db -1
+	db map_end_setup_script

 MapSetupScript3: ; 153e7
 	db map_fade
@@ -202,7 +151,7 @@ MapSetupScript3: ; 153e7
 	db map_fade_in_palettes
 	db map_animations_on
 	db map_wildmons
-	db -1
+	db map_end_setup_script

 MapSetupScript8: ; 153f7
 	db map_fade
@@ -221,7 +170,7 @@ MapSetupScript8: ; 153f7
 	db map_animations_on
 	db map_wildmons
 	db map_text_scroll_off
-	db -1
+	db map_end_setup_script

 MapSetupScript2: ; 15408
 	db map_lcd_off
@@ -241,12 +190,12 @@ MapSetupScript2: ; 15408
 	db map_fade_in_palettes
 	db map_animations_on
 	db map_wildmons
-	db -1
+	db map_end_setup_script

 MapSetupScript10: ; 1541a
 	db map_load_blocks
 	db map_connection_blocks
-	db -1
+	db map_end_setup_script


 ReadMapSetupScript: ; 1541d
@@ -374,13 +323,13 @@ Function154ea: ; 154ea
 ; 154eb

 DelayClearingOldSprites: ; 154eb
-	ld hl, wd45b
+	ld hl, wPlayerSpriteSetupFlags
 	set 7, [hl]
 	ret
 ; 154f1

 DelayLoadingNewSprites: ; 154f1
-	ld hl, wd45b
+	ld hl, wPlayerSpriteSetupFlags
 	set 6, [hl]
 	ret

--- a/engine/more_phone_scripts.asm
+++ b/engine/more_phone_scripts.asm
@@ -1656,5 +1656,5 @@ UnknownScript_0xa0b04:
 BikeShopPhoneScript:
 	farwritetext UnknownText_0x174000
 	clearflag ENGINE_BIKE_SHOP_CALL_ENABLED
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end
--- a/engine/pack.asm
+++ b/engine/pack.asm
--- a/engine/phone.asm
+++ b/engine/phone.asm
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -141,7 +141,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac
 MomPhoneLectureScript: ; 0xbcfb1
 	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	setflag ENGINE_DST
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	farwritetext MomPhoneLectureText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
@@ -194,7 +194,7 @@ BillPhoneScript2: ; 0xbd007
 ; Elm

 ElmPhoneScript1: ; 0xbd00d
-	checkcode VAR_POKERUS
+	checkcode VAR_SPECIALPHONECALL
 	if_equal $1, .pokerus
 	checkevent EVENT_SHOWED_TOGEPI_TO_ELM
 	iftrue .discovery
@@ -253,46 +253,46 @@ ElmPhoneScript1: ; 0xbd00d

 .pokerus ; 0xbd079
 	farwritetext ElmPhonePokerusText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end

 ElmPhoneScript2: ; 0xbd081
-	checkcode VAR_POKERUS
+	checkcode VAR_SPECIALPHONECALL
 	if_equal $2, .disaster
 	if_equal $3, .assistant
 	if_equal $4, .rocket
 	if_equal $5, .gift
 	if_equal $8, .gift
 	farwritetext ElmPhonePokerusText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end

 .disaster ; 0xbd09f
 	farwritetext ElmPhoneDisasterText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
 	end

 .assistant ; 0xbd0aa
 	farwritetext ElmPhoneEggAssistantText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
 	setevent EVENT_ELMS_AIDE_IN_LAB
 	end

 .rocket ; 0xbd0b8
 	farwritetext ElmPhoneRocketText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end

 .gift ; 0xbd0c0
 	farwritetext ElmPhoneGiftText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end

 .unused ; 0xbd0c8
 	farwritetext ElmPhoneUnusedText
-	specialphonecall ELMCALL_NONE
+	specialphonecall SPECIALCALL_NONE
 	end
 ; bd0d0

@@ -833,7 +833,7 @@ UnknownScript_0xbd544:
 	pokenamemem QWILFISH, $1
 	displaylocation ROUTE_32, $2
 	writebyte $1
-	special Functionc3fc
+	special Special_ActivateFishingSwarm
 	farjump UnknownScript_0xa05d6

 UnknownScript_0xbd55c:
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -16,10 +16,10 @@ Pokedex: ; 40000
 	push af
 	xor a
 	ld [VramState], a
-	ld a, [$ffaa]
+	ld a, [hInMenu]
 	push af
 	ld a, $1
-	ld [$ffaa], a
+	ld [hInMenu], a

 	xor a
 	ld [$ffde], a
@@ -27,8 +27,8 @@ Pokedex: ; 40000
 	call DelayFrame

 .main
-	call Functiona57
-	ld a, [wcf63]
+	call JoyTextDelay
+	ld a, [wJumptableIndex]
 	bit 7, a
 	jr nz, .exit
 	call Function4010b
@@ -44,7 +44,7 @@ Pokedex: ; 40000
 	ld [wd959], a

 	pop af
-	ld [$ffaa], a
+	ld [hInMenu], a
 	pop af
 	ld [VramState], a
 	pop af
@@ -75,7 +75,7 @@ ENDC
 	call ByteFill

 	xor a
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ld [wcf64], a
 	ld [wcf65], a
 	ld [wcf66], a
@@ -173,7 +173,7 @@ Function400ed: ; 400ed
 ; 4010b

 Function4010b: ; 4010b
-	ld a, [wcf63]
+	ld a, [wJumptableIndex]
 	ld hl, Jumptable_40115
 	call Function41432
 	jp [hl]
@@ -198,12 +198,12 @@ Jumptable_40115: ; 40115 (10:4115)


 Function40131: ; 40131 (10:4131)
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	inc [hl]
 	ret

 Function40136: ; 40136 (10:4136)
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	set 7, [hl]
 	ret

@@ -283,7 +283,7 @@ Function401ae: ; 401ae (10:41ae)
 	call Function40bd0
 	ret z
 	ld a, $2
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ld a, $0
 	ld [wcf64], a
 	ret
@@ -291,7 +291,7 @@ Function401ae: ; 401ae (10:41ae)
 .select
 	call Function41401
 	ld a, $7
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	xor a
 	ld [hSCX], a ; $ff00+$cf
 	ld a, $a7
@@ -302,7 +302,7 @@ Function401ae: ; 401ae (10:41ae)
 .start
 	call Function41401
 	ld a, $5
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	xor a
 	ld [hSCX], a ; $ff00+$cf
 	ld a, $a7
@@ -312,7 +312,7 @@ Function401ae: ; 401ae (10:41ae)

 .b
 	ld a, $d
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret

 Function40217: ; 40217 (10:4217)
@@ -372,7 +372,7 @@ Function40258: ; 40258 (10:4258)
 .asm_40288
 	call MaxVolume
 	ld a, [wcf64]
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret
 ; 40292 (10:4292)

@@ -408,7 +408,7 @@ Function402aa: ; 402aa (10:42aa)
 	call Function41423
 	ld a, [CurPartySpecies]
 	call PlayCry
-	ld hl, wcf63
+	ld hl, wJumptableIndex
 	dec [hl]
 	ret
 ; 402e8 (10:42e8)
@@ -478,11 +478,11 @@ Function4034f: ; 4034f
 	push af
 	ld a, [wcf64]
 	push af
-	ld a, [wcf63]
+	ld a, [wJumptableIndex]
 	push af
 	callba Function8442c
 	pop af
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	pop af
 	ld [wcf64], a
 	pop af
@@ -552,7 +552,7 @@ Function403be: ; 403be (10:43be)
 .asm_403ea
 	call Function41401
 	ld a, $0
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret
 ; 403f3 (10:43f3)

@@ -604,13 +604,13 @@ Function40417: ; 40417 (10:4417)
 .asm_40431
 	call Function41401
 	ld a, $0
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret

 Function4043a: ; 4043a (10:443a)
 	call Function41401
 	ld a, $b
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret

 Function40443: ; 40443 (10:4443)
@@ -656,7 +656,7 @@ Function40471: ; 40471 (10:4471)
 .asm_40495
 	call Function41401
 	ld a, $0
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret
 ; 4049e (10:449e)

@@ -710,14 +710,14 @@ Function404b7: ; 404b7
 	ld [wc7d1], a
 	call Function41401
 	ld a, $9
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret
 ; 40501

 Function40501: ; 40501
 	call Function41401
 	ld a, $0
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ret
 ; 4050a

@@ -779,7 +779,7 @@ Function40562: ; 40562 (10:4562)
 	call Function40bd0
 	ret z
 	ld a, $2
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	ld a, $9
 	ld [wcf64], a
 	ret
@@ -795,7 +795,7 @@ Function40562: ; 40562 (10:4562)
 	call ClearSprites
 	call Function40bdc
 	ld a, $5
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	xor a
 	ld [hSCX], a ; $ff00+$cf
 	ld a, $a7
@@ -827,7 +827,7 @@ Function405df: ; 405df (10:45df)
 .asm_405eb
 	call Function41401
 	ld a, $7
-	ld [wcf63], a
+	ld [wJumptableIndex], a
 	call DelayFrame
 	call Function41a24
 	jr nz, .asm_40603
@@ -836,7 +836,7 @@ Function405df: ; 405df (10:45df)

 .asm_40603
 	ld hl, PokedexLZ
-	ld de, $9310
+	ld de, VTiles2 tile $31
 	lb bc, BANK(PokedexLZ), $3a
 	call Functione73

@@ -844,7 +844,7 @@ Function405df: ; 405df (10:45df)
 	ret

 Function40610: ; 40610 (10:4610)
-	ld hl, $ffa9
+	ld hl, hJoyLast
 	ld a, [hl]
 	and D_RIGHT
 	jr nz, .right
@@ -913,7 +913,7 @@ Function4066c: ; 4066c (10:466c)
 	ld [wc7e2], a
 	ld a, [wc7d0]
 	ld [wc7e3], a
-	ld hl, $ffa9
+	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
 	jr nz, .up
@@ -964,7 +964,7 @@ Function406c5: ; 406c5 (10:46c5)
 	ld d, a
 	ld a, [wc7d2]
 	ld e, a
-	ld hl, $ffa9
+	ld hl, hJoyLast
 	ld a, [hl]
 	and D_UP
 	jr nz, Function406ea
@@ -1799,7 +1799,7 @@ Function40f4f: ; 40f4f (10:4f4f)
 	ld a, [wc7d8]
 	cp $2
 	jr nc, .asm_40f63
-	ld hl, $ffa9
+	ld hl, hJoyLast
 	ld a, [hl]
 	and $20
 	jr nz, .asm_40f65
@@ -2274,7 +2274,7 @@ Function4135a: ; 4135a (10:535a)
 	jr nz, .asm_413c1
 	call Function413f5
 	jr c, .asm_413bf
-	ld hl, $ffa9
+	ld hl, hJoyLast
 	ld a, [hl]
 	and D_LEFT | D_UP
 	and b
@@ -2460,7 +2460,7 @@ Function4147b: ; 4147b
 	push hl
 	ld e, l
 	ld d, h
-	ld hl, $9620
+	ld hl, VTiles2 tile $62
 	lb bc, BANK(Footprints), 2
 	call Request1bpp
 	pop hl
@@ -2472,7 +2472,7 @@ Function4147b: ; 4147b

 	ld e, l
 	ld d, h
-	ld hl, $9640
+	ld hl, VTiles2 tile $64
 	lb bc, BANK(Footprints), 2
 	call Request1bpp

@@ -2488,7 +2488,7 @@ Function414b7: ; 414b7
 	call ByteFill
 	call Function414fb
 	call Functione5f
-	ld hl, $9600
+	ld hl, VTiles2 tile $60
 	ld bc, $0200
 	call Function41504
 	call Function41a24
@@ -2498,7 +2498,7 @@ Function414b7: ; 414b7

 .asm_414e0
 	ld hl, PokedexLZ
-	ld de, $9310
+	ld de, VTiles2 tile $31
 	call Decompress

 .asm_414e9
@@ -2554,7 +2554,7 @@ Function41a2c: ; 41a2c
 	ld bc, $1b0
 	call Function41504
 	ld de, sScratch + $188
-	ld hl, $9400
+	ld hl, VTiles2 tile $40
 	lb bc, BANK(Function41a2c), $1b
 	call Request2bpp
 	call CloseSRAM
@@ -2575,7 +2575,7 @@ Function41a58: ; 41a58 (10:5a58)
 	ld a, UNOWN
 	ld [CurPartySpecies], a
 	call GetBaseData
-	ld de, $9000
+	ld de, VTiles2 tile $00
 	predef GetFrontpic
 	pop af
 	ld [UnownLetter], a
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -82,9 +82,9 @@ PredefPointers:: ; 856b
 	add_predef Predef_LoadSGBLayout
 	add_predef Function91d11
 	add_predef CheckContestMon
-	add_predef Function8c20f
-	add_predef Function8c000
-	add_predef Function8c000_2
+	add_predef Predef_StartBattle
+	add_predef Predef35
+	add_predef Predef36
 	add_predef PlayBattleAnim
 	add_predef Predef38 ; $38
 	add_predef Predef39
--- a/engine/radio.asm
+++ b/engine/radio.asm
@@ -1707,7 +1707,7 @@ BuenasPassword3: ; b8f47 (2e:4f47)
 BuenasPassword4: ; b8f55 (2e:4f55)
 	call BuenasPasswordCheckMidnight
 	jp c, BuenasPassword8
-	ld a, [wdc4a]
+	ld a, [wBuenasPassword]
 ; If we already generated the password today, we don't need to generate a new one.
 	ld hl, WeeklyFlags
 	bit 7, [hl]
@@ -1727,9 +1727,9 @@ BuenasPassword4: ; b8f55 (2e:4f55)
 	and $3
 	cp $3
 	jr nc, .greater_than_three
-; The high nybble of wdc4a will now contain the password group index, and the low nybble contains the actual password.
+; The high nybble of wBuenasPassword will now contain the password group index, and the low nybble contains the actual password.
 	add e
-	ld [wdc4a], a
+	ld [wBuenasPassword], a
 ; Set the flag so that we don't generate a new password this week.
 	ld hl, WeeklyFlags
 	set 7, [hl]
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -380,7 +380,7 @@ ErasePreviousSave: ; 14cbb
 	ld [sStackTop + 1], a
 	call CloseSRAM
 	ld a, $1
-	ld [wd4b4], a
+	ld [wSavedAtLeastOnce], a
 	ret
 ; 14ce2

@@ -486,7 +486,7 @@ Function14d93: ; 14d93


 Function14da0: ; 14da0
-	ld a, [wd4b4]
+	ld a, [wSavedAtLeastOnce]
 	and a
 	ret nz
 	call ErasePreviousSave
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -529,7 +529,7 @@ Script_interpretmenu: ; 0x96f41
 	ld a, [ScriptBank]
 	ld hl, InterpretMenu
 	rst FarCall
-	ld a, [wcf88]
+	ld a, [wPocketCursorBuffer]
 	jr nc, .ok
 	xor a
 .ok
@@ -651,7 +651,7 @@ Script_specialsound: ; 0x96fe4
 ; script command 0x88

 	callba CheckItemPocket
-	ld a, [wd142]
+	ld a, [wItemAttributeParamBuffer]
 	cp TM_HM
 	ld de, SFX_GET_TM
 	jr z, .play
@@ -665,7 +665,7 @@ Script_specialsound: ; 0x96fe4

 GetPocketName: ; 96ffe
 	callba CheckItemPocket
-	ld a, [wd142]
+	ld a, [wItemAttributeParamBuffer]
 	dec a
 	ld hl, .Pockets
 	and 3
@@ -1338,12 +1338,12 @@ Script_moveperson: ; 0x97341
 	call GetScriptPerson
 	ld b, a
 	call GetScriptByte
-	add $4
+	add 4
 	ld d, a
 	call GetScriptByte
-	add $4
+	add 4
 	ld e, a
-	callba Function807e
+	callba CopyDECoordsToMapObject
 	ret
 ; 0x9735b

@@ -1385,10 +1385,10 @@ Script_loademote: ; 0x97384
 ;     bubble (SingleByteParam)

 	call GetScriptByte
-	cp $ff
-	jr nz, .asm_9738e ; 0x97389 $3
+	cp -1
+	jr nz, .not_var_emote ; 0x97389 $3
 	ld a, [ScriptVar]
-.asm_9738e
+.not_var_emote
 	ld c, a
 	callba Function1442f
 	ret
@@ -1417,7 +1417,7 @@ Script_showemote: ; 0x97396
 ; 0x973b6

 ShowEmoteScript: ; 973b6
-	loademote $ff
+	loademote -1
 	applymovement2 .Show
 	pause 0
 	applymovement2 .Hide
@@ -1448,12 +1448,12 @@ Script_earthquake: ; 0x973c7
 	ld [wd003], a
 	and $3f
 	ld [wd005], a
-	ld b, BANK(UnknownScript_0x973e6)
-	ld de, UnknownScript_0x973e6
+	ld b, BANK(.script)
+	ld de, .script
 	jp ScriptCall
 ; 0x973e6

-UnknownScript_0x973e6: ; 973e6
+.script: ; 973e6
 	applymovement PLAYER, wd002
 	end
 ; 973eb
@@ -1487,7 +1487,7 @@ Script_battlecheck: ; 0x973fb
 Script_loadtrainerdata: ; 0x97400
 ; script command 0x5c

-	ld a, $81
+	ld a, (1 << 7) | 1
 	ld [wd459], a
 	ld a, [WalkingDirection]
 	ld [OtherTrainerClass], a
@@ -1502,7 +1502,7 @@ Script_loadpokedata: ; 0x97412
 ;     pokemon (PokemonParam)
 ;     level (DecimalParam)

-	ld a, $80
+	ld a, (1 << 7)
 	ld [wd459], a
 	call GetScriptByte
 	ld [TempWildMonSpecies], a
@@ -1517,7 +1517,7 @@ Script_loadtrainer: ; 0x97424
 ;     trainer_group (TrainerGroupParam)
 ;     trainer_id (TrainerIdParam)

-	ld a, $81
+	ld a, (1 << 7) | 1
 	ld [wd459], a
 	call GetScriptByte
 	ld [OtherTrainerClass], a
@@ -1531,7 +1531,7 @@ Script_startbattle: ; 0x97436

 	call BufferScreen
 	predef StartBattle
-	ld a, [wd0ee]
+	ld a, [wBattleResult]
 	and $3f
 	ld [ScriptVar], a
 	ret
@@ -1555,26 +1555,28 @@ Script_returnafterbattle: ; 0x97459
 	ld hl, wd459
 	ld d, [hl]
 	ld [hl], $0
-	ld a, [wd0ee]
+	ld a, [wBattleResult]
 	and $3f
 	cp $1
-	jr nz, .asm_97470 ; 0x97466 $8
+	jr nz, .notblackedout ; 0x97466 $8
 	ld b, BANK(UnknownScript_0x124c1)
 	ld hl, UnknownScript_0x124c1
 	jp ScriptJump
-.asm_97470
+
+.notblackedout
 	bit 0, d
-	jr z, .asm_9747c ; 0x97472 $8
-	callba Functionfcfec
-	jr .asm_9748e ; 0x9747a $12
-.asm_9747c
-	ld a, [wd0ee]
+	jr z, .was_wild ; 0x97472 $8
+	callba MomTriesToBuySomething
+	jr .done ; 0x9747a $12
+
+.was_wild
+	ld a, [wBattleResult]
 	bit 7, a
-	jr z, .asm_9748e ; 0x97481 $b
-	ld b, BANK(UnknownScript_0x90255)
-	ld de, UnknownScript_0x90255
-	callba Function97c4f
-.asm_9748e
+	jr z, .done ; 0x97481 $b
+	ld b, BANK(Script_SpecialBillCall)
+	ld de, Script_SpecialBillCall
+	callba LoadScriptBDE
+.done
 	jp Script_reloadmap
 ; 0x97491

@@ -1583,7 +1585,7 @@ Script_reloadmap: ; 0x97491

 	xor a
 	ld [wd459], a
-	ld a, $f3
+	ld a, MAPSETUP_RELOADMAP
 	ld [hMapEntryMethod], a
 	ld a, $1
 	call LoadMapStatus
@@ -2202,7 +2204,7 @@ Script_name: ; 0x97716
 ;     memory (SingleByteParam)

 	call GetScriptByte
-	ld [wcf61], a
+	ld [wNamedObjectTypeBuffer], a

 ContinueToGetName: ; 0x9771c
 	call GetScriptByte
@@ -2219,7 +2221,7 @@ Script_trainerclassname: ; 0x9772b
 ;     memory (SingleByteParam)

 	ld a, TRAINER_NAME
-	ld [wcf61], a
+	ld [wNamedObjectTypeBuffer], a
 	jr ContinueToGetName ; 0x97730 $ea
 ; 0x97732

@@ -2811,10 +2813,10 @@ Script_warpfacing: ; 0x97a0e
 	call GetScriptByte
 	and $3
 	ld c, a
-	ld a, [wd45b]
+	ld a, [wPlayerSpriteSetupFlags]
 	set 5, a
 	or c
-	ld [wd45b], a
+	ld [wPlayerSpriteSetupFlags], a
 ; fall through

 Script_warp: ; 0x97a1d
@@ -2838,7 +2840,7 @@ Script_warp: ; 0x97a1d
 	ld [YCoord], a
 	ld a, -1
 	ld [wd001], a
-	ld a, -15
+	ld a, MAPSETUP_WARP
 	ld [hMapEntryMethod], a
 	ld a, 1
 	call LoadMapStatus
@@ -2850,7 +2852,7 @@ Script_warp: ; 0x97a1d
 	call GetScriptByte
 	ld a, -1
 	ld [wd001], a
-	ld a, -5
+	ld a, MAPSETUP_BADWARP
 	ld [hMapEntryMethod], a
 	ld a, 1
 	call LoadMapStatus
@@ -2966,7 +2968,7 @@ Script_reloadmappart:: ; 0x97ae3
 ; script command 0x7c

 	xor a
-	ld [$ffd4], a
+	ld [hBGMapMode], a
 	call Function2173
 	call Function2914
 	callba Function104061
@@ -3011,7 +3013,7 @@ Script_reloadandreturn: ; 0x97b16
 Script_loadfont: ; 0x97b1c
 ; script command 0x47

-	call Function2e08
+	call LoadFont
 	ret
 ; 0x97b20

@@ -3044,7 +3046,7 @@ Script_loadmovesprites: ; 0x97b2f
 ; script command 0x49

 	call Function2e20
-	call Function2dcf
+	call LoadMoveSprites
 	ret
 ; 0x97b36

--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -39,7 +39,7 @@ SpecialsPointers:: ; c029
 	add_special Special_GetMysteryGiftItem
 	add_special Special_UnlockMysteryGift

-; Bug Catching Contest
+; Map Events
 	add_special BugContestJudging
 	add_special CheckPartyFullAfterContest
 	add_special CheckFirstMonFainted
@@ -88,25 +88,25 @@ SpecialsPointers:: ; c029
 	add_special Special_FindAtLeastThatHappy
 	add_special Special_FindThatSpecies
 	add_special Special_FindThatSpeciesYourTrainerID
-	add_special Functionc3ef
-	add_special Function17421
-	add_special Function17440
+	add_special Special_CheckUnusedTwoDayTimer ; unreferenced
+	add_special Special_DayCareMon1
+	add_special Special_DayCareMon2
 	add_special Special_SelectRandomBugContestContestants
-	add_special Functionc3fc
+	add_special Special_ActivateFishingSwarm
 	add_special ToggleMaptileDecorations
 	add_special ToggleDecorationsVisibility
 	add_special SpecialGiveShuckle
 	add_special SpecialReturnShuckle
-	add_special Function73f7
+	add_special Special_BillsGrandfather
 	add_special SpecialCheckPokerus
-	add_special Function24b25
-	add_special Function24b4e
+	add_special Special_DisplayCoinCaseBalance
+	add_special Special_DisplayMoneyAndCoinBalance
 	add_special Function24ae8
 	add_special Special_CheckForLuckyNumberWinners
 	add_special Special_CheckLuckyNumberShowFlag
 	add_special Special_ResetLuckyNumberShowFlag
-	add_special Function4d9d3
-	add_special Function88018
+	add_special Special_PrintTodaysLuckyNumber
+	add_special Special_SelectApricornForKurt
 	add_special SpecialNameRater
 	add_special Functionc2da
 	add_special GetFirstPokemonHappiness
@@ -169,7 +169,7 @@ SpecialsPointers:: ; c029
 	add_special SpecialBuenasPassword
 	add_special SpecialBuenaPrize
 	add_special SpecialDratini
-	add_special Function11485
+	add_special Special_SampleKenjiBreakCountdown
 	add_special SpecialBeastsCheck
 	add_special SpecialMonCheck
 	add_special Functionc225
@@ -482,16 +482,16 @@ ScriptReturnCarry: ; c3e2
 	ret
 ; c3ef

-Functionc3ef: ; c3ef
-	callba Function1150c
-	ld a, [wdc3a]
+Special_CheckUnusedTwoDayTimer: ; c3ef
+	callba CheckUnusedTwoDayTimer
+	ld a, [wUnusedTwoDayTimer]
 	ld [ScriptVar], a
 	ret
 ; c3fc

-Functionc3fc: ; c3fc
+Special_ActivateFishingSwarm: ; c3fc
 	ld a, [ScriptVar]
-	ld [wdfce], a
+	ld [wFishingSwarmFlag], a
 	ret
 ; c403

@@ -523,7 +523,7 @@ SpecialCheckPokerus: ; c419
 ; c422

 Special_ResetLuckyNumberShowFlag: ; c422
-	callba Function1152b
+	callba RestartLuckyNumberCountdown
 	ld hl, wLuckyNumberShowFlag
 	res 0, [hl]
 	callba LoadOrRegenerateLuckyIDNumber
@@ -531,7 +531,7 @@ Special_ResetLuckyNumberShowFlag: ; c422
 ; c434

 Special_CheckLuckyNumberShowFlag: ; c434
-	callba Function11542
+	callba CheckLuckyNumberShowFlag
 	jp ScriptReturnCarry
 ; c43d

--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -159,7 +159,7 @@ PokeCenterNurseScript:

 .pokerus_done
 	setflag ENGINE_POKERUS
-	specialphonecall ELMCALL_POKERUS
+	specialphonecall SPECIALCALL_POKERUS
 	end

 DifficultBookshelfScript:
@@ -297,7 +297,7 @@ RadioTowerRocketsScript:
 	clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER
 	clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
-	specialphonecall ELMCALL_WEIRDBROADCAST
+	specialphonecall SPECIALCALL_WEIRDBROADCAST
 	domaptrigger MAHOGANY_TOWN, $1
 	end

@@ -1809,7 +1809,7 @@ CoinVendor_IntroScript: ; 0xbcde0
 	farwritetext CoinVendor_IntroText

 CoinVendor_SellCoinsMenuScript: ; 0xbcde4
-	special Function24b4e
+	special Special_DisplayMoneyAndCoinBalance
 	loadmenudata CoinVendor_MenuDataHeader
 	interpretmenu2
 	writebackup
--- a/Show More
+++ b/Show More