Annotate battle tower text bug

21 files changed, 129 insertions, 130 deletions

diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index 2b32e41b9..845af9d2a 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -26,7 +26,7 @@ Predef_StartBattle: ; 8c20f
 	ld a, $5
 	ld [rSVBK], a
 
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld bc, 8 palettes
 	xor a
 	call ByteFill
@@ -661,7 +661,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	ld [rSVBK], a
 	call .copypals
 	push hl
-	ld de, wMapPals + 8 * 7
+	ld de, UnknBGPals + 8 * 7
 	ld bc, $8
 	call CopyBytes
 	pop hl
@@ -680,15 +680,15 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
 	ret
 
 .copypals: ; 8c677 (23:4677)
-	ld de, wMapPals + 8 * 7
+	ld de, UnknBGPals + 8 * 7
 	call .copy
 	ld de, BGPals + 8 * 7
 	call .copy
-	ld de, Unkn2Pals + 8 * 6
+	ld de, UnknOBPals + 8 * 6
 	call .copy
 	ld de, OBPals + 8 * 6
 	call .copy
-	ld de, Unkn2Pals + 8 * 7
+	ld de, UnknOBPals + 8 * 7
 	call .copy
 	ld de, OBPals + 8 * 7
 
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index ea365d8b5..ebf5e48d8 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -650,7 +650,7 @@ Function1723c: ; 1723c (5:723c)
 	ld hl, BattleMonDVs
 	predef GetUnownLetter
 	pop de
-	predef_jump Function5108b
+	predef_jump FrontpicPredef
 
 Function17254: ; 17254 (5:7254)
 	push af
@@ -775,7 +775,7 @@ Function1728f: ; 1728f (5:728f)
 
 Function17363: ; 17363 (5:7363)
 	ld [PlayerHPPal], a
-	ld b, $b
+	ld b, SCGB_0B
 	ld c, $0
 	jp GetSGBLayout
 
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index 8ee1e5cd9..df9d895d1 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -1621,7 +1621,7 @@ Functione0c37: ; e0c37 (38:4c37)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e0c93
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $48
 	call CopyBytes
 	pop af
@@ -1751,7 +1751,7 @@ Functione1190: ; e1190
 	ld a, $93
 	ld [rLCDC], a
 	call WaitBGMap
-	ld b, $18
+	ld b, SCGB_18
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
diff --git a/engine/color.asm b/engine/color.asm
index bf428f51c..7e7520816 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -117,7 +117,7 @@ Function8ad1: ; 8ad1
 	ret
 ; 8ade
 
-Function8ade: ; 8ade
+Function8ade: ; 8ade SGB layout $fc
 	ld hl, wcd9b
 	ld a, [wcda9]
 	ld e, a
@@ -149,7 +149,7 @@ Function8b07: ; 8b07
 	call CheckCGB
 	ret z
 	ld hl, Palette8b2f
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $0008
 	ld a, $5
 	call FarCopyWRAM
@@ -200,7 +200,7 @@ Function8b4d: ; 8b4d
 	jp Function9809
 
 .asm_8b5c
-	ld de, Unkn2Pals
+	ld de, UnknOBPals
 	ld a, $3b
 	call GetAthPalletFromPalettes9df6
 	jp LoadHLPaletteIntoDE
@@ -216,7 +216,7 @@ Function8b67: ; 8b67
 	jp Function9809
 
 .asm_8b76
-	ld de, Unkn2Pals
+	ld de, UnknOBPals
 	ld a, $3c
 	call GetAthPalletFromPalettes9df6
 	jp LoadHLPaletteIntoDE
@@ -248,7 +248,7 @@ Function8b81: ; 8b81
 	jp Function9809
 
 .asm_8bb2
-	ld de, Unkn2Pals
+	ld de, UnknOBPals
 	ld a, c
 	call Function9775
 	call Function9643
@@ -275,7 +275,7 @@ endr
 
 asm_8bd7
 	push hl
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld de, $0008
 .asm_8bde
 	and a
@@ -338,7 +338,7 @@ Function8c1d: ; 8c1d
 	call Function976b
 
 .asm_8c33
-	ld de, wMapPals
+	ld de, UnknBGPals
 	call Function9643
 	call Function9699
 	call Function96b3
@@ -412,11 +412,11 @@ endr
 	ld a, $5
 	ld [rSVBK], a
 	ld a, [hli]
-	ld [wMapPals], a
-	ld [wMapPals + 8 * 2], a
+	ld [UnknBGPals], a
+	ld [UnknBGPals + 8 * 2], a
 	ld a, [hl]
-	ld [wMapPals + 1], a
-	ld [wMapPals + 8 * 2 + 1], a
+	ld [UnknBGPals + 1], a
+	ld [UnknBGPals + 8 * 2 + 1], a
 	pop af
 	ld [rSVBK], a
 	call Function96a4
@@ -458,7 +458,7 @@ endr
 	ret
 
 .asm_8cf0
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $0008
 	ld a, $5
 	call FarCopyWRAM
@@ -525,7 +525,7 @@ INCLUDE "predef/cgb.asm"
 
 Function95f0: ; 95f0
 	ld hl, Palette_9608
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, 8
 	ld a, $5
 	call FarCopyWRAM
@@ -544,7 +544,7 @@ Palette_9608: ; 9608
 
 
 CopyFourPalettes: ; 9610
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld c, $4
 
 CopyPalettes: ; 9615
@@ -644,9 +644,9 @@ Function9673: ; 9673
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wMapPals
-	ld c, $8
-.asm_9683
+	ld hl, UnknBGPals
+	ld c, 8
+.loop
 	ld a, $ff
 rept 4
 	ld [hli], a
@@ -656,7 +656,7 @@ rept 4
 	ld [hli], a
 endr
 	dec c
-	jr nz, .asm_9683
+	jr nz, .loop
 	pop af
 	ld [rSVBK], a
 	pop hl
@@ -676,7 +676,7 @@ Function9699: ; 9699
 ; 96a4
 
 Function96a4: ; 96a4
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld de, BGPals
 	ld bc, $0080
 	ld a, $5
@@ -728,7 +728,7 @@ Function96b3: ; 96b3
 	ret
 ; 96f3
 
-Function96f3: ; 96f3
+Function96f3: ; 96f3 CGB layout $fc
 	ld hl, wcd9b
 	ld a, [wcda9]
 	ld e, a
@@ -759,7 +759,7 @@ Function96f3: ; 96f3
 
 Function971a: ; 971a
 	ld hl, Palettes_b681
-	ld de, Unkn2Pals
+	ld de, UnknOBPals
 	ld bc, $0010
 	ld a, $5
 	call FarCopyWRAM
@@ -843,7 +843,7 @@ Function977a: ; 977a
 	dec c
 	jr nz, .asm_9787
 	ld hl, Palettes_979c
-	ld de, Unkn2Pals + 8 * 2
+	ld de, UnknOBPals + 8 * 2
 	ld bc, $0010
 	ld a, $5
 	call FarCopyWRAM
@@ -1047,7 +1047,7 @@ Function9890:: ; 9890
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	call Function98df
 	ld hl, BGPals
 	call Function98df
@@ -1058,13 +1058,13 @@ Function9890:: ; 9890
 
 Function98df: ; 98df
 	ld c, $40
-.asm_98e1
+.loop
 	ld a, $ff
 	ld [hli], a
 	ld a, $7f
 	ld [hli], a
 	dec c
-	jr nz, .asm_98e1
+	jr nz, .loop
 	ret
 ; 98eb
 
@@ -1974,7 +1974,7 @@ endr
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld b, $8
 .asm_b210
 	ld a, [de]
@@ -2010,9 +2010,9 @@ endr
 	ld bc, $40
 	ld hl, MapObjectPals
 	call AddNTimes
-	ld de, Unkn2Pals
+	ld de, UnknOBPals
 	ld bc, $40
-	ld a, $5 ; BANK(Unkn2Pals)
+	ld a, $5 ; BANK(UnknOBPals)
 	call FarCopyWRAM
 
 	ld a, [wPermission]
@@ -2037,7 +2037,7 @@ rept 4
 	inc hl
 endr
 .asm_b26d
-	ld de, wMapPals + 8 * 6 + 2
+	ld de, UnknBGPals + 8 * 6 + 2
 	ld bc, 4
 	ld a, $5
 	call FarCopyWRAM
diff --git a/engine/credits.asm b/engine/credits.asm
index 6b35fbe6a..6e2bef12d 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -637,10 +637,10 @@ GetCreditsPalette: ; 109b2c
 	
 	push af
 	push hl
-	add wMapPals % $100
+	add UnknBGPals % $100
 	ld e, a
 	ld a, 0
-	adc wMapPals / $100
+	adc UnknBGPals / $100
 	ld d, a
 	ld bc, 24
 	call CopyBytes
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index 0ed427de4..69a068ff9 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -524,7 +524,7 @@ IntroScene1: ; e495b (39:495b)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_365ad
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_365ad
@@ -597,7 +597,7 @@ IntroScene3: ; e49fd (39:49fd)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e5edd
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e5edd
@@ -662,7 +662,7 @@ IntroScene5: ; e4a7a (39:4a7a)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_365ad
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_365ad
@@ -759,7 +759,7 @@ IntroScene7: ; e4b3f (39:4b3f)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e5edd
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e5edd
@@ -909,7 +909,7 @@ IntroScene11: ; e4c86 (39:4c86)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_365ad
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_365ad
@@ -1034,7 +1034,7 @@ IntroScene13: ; e4d6d (39:4d6d)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e5edd
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e5edd
@@ -1143,7 +1143,7 @@ IntroScene15: ; e4e40 (39:4e40)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e77dd
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e77dd
@@ -1217,7 +1217,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e6d6d
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e6d6d
@@ -1291,7 +1291,7 @@ IntroScene19: ; e4f7e (39:4f7e)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e77dd
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e77dd
@@ -1459,7 +1459,7 @@ IntroScene26: ; e50bb (39:50bb)
 	ld a, $5
 	ld [rSVBK], a
 	ld hl, Palette_e679d
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, $80
 	call CopyBytes
 	ld hl, Palette_e679d
@@ -1785,7 +1785,7 @@ endr
 	ld bc, $8
 	call CopyBytes
 	pop bc
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld a, c
 	add e
 	ld e, a
diff --git a/engine/debug.asm b/engine/debug.asm
index 913ea0a8d..0d2720990 100755
--- a/engine/debug.asm
+++ b/engine/debug.asm
@@ -1244,7 +1244,7 @@ Function8220f: ; 8220f
 rept 3
 	add hl, hl
 endr
-	ld de, wMapPals
+	ld de, UnknBGPals
 	add hl, de
 	ld de, wc608
 	ld bc, 8
diff --git a/engine/diploma.asm b/engine/diploma.asm
index d2ca46bb3..8f8ef9e99 100644
--- a/engine/diploma.asm
+++ b/engine/diploma.asm
@@ -31,7 +31,7 @@ Function1dd709: ; 1dd709
 	call PlaceString
 	call EnableLCD
 	call WaitBGMap
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	call SetPalettes
 	call DelayFrame
diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm
index 72a8e3a80..4e8dad1a3 100755
--- a/engine/dummy_game.asm
+++ b/engine/dummy_game.asm
@@ -8,7 +8,7 @@ _DummyGame: ; e1e5b (38:5e5b)
 
 Functione1e67: ; e1e67 (38:5e67)
 	call DisableLCD
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	callab Function8cf53
 	ld hl, LZ_e2221
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index 8e0a4af6d..835db8b52 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -52,11 +52,11 @@ _EvolutionAnimation: ; 4e607
 	ld [PlayerHPPal], a
 
 	ld c, $0
-	call Function4e703
+	call .GetSGBLayout
 	ld a, [Buffer1]
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
-	call Function4e708
+	call .PlaceFrontpic
 
 	ld de, VTiles2
 	ld hl, VTiles2 tile $31
@@ -65,11 +65,11 @@ _EvolutionAnimation: ; 4e607
 
 	ld a, $31
 	ld [wd1ec], a
-	call Evolution_FlashFrontpics
+	call .ReplaceFrontpic
 	ld a, [Buffer2]
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
-	call Function4e711
+	call .LoadFrontpic
 	ld a, [Buffer1]
 	ld [CurPartySpecies], a
 	ld [CurSpecies], a
@@ -90,14 +90,14 @@ _EvolutionAnimation: ; 4e607
 	call DelayFrames
 
 	ld c, $1
-	call Function4e703
-	call Function4e726
-	jr c, .pressed_b
+	call .GetSGBLayout
+	call .AnimationSequence
+	jr c, .cancel_evo
 
-	ld a, $cf
+	ld a, -7 * 7
 	ld [wd1ec], a
 
-	call Evolution_FlashFrontpics
+	call .ReplaceFrontpic
 	xor a
 	ld [wd1ed], a
 
@@ -105,7 +105,7 @@ _EvolutionAnimation: ; 4e607
 	ld [PlayerHPPal], a
 
 	ld c, $0
-	call Function4e703
+	call .GetSGBLayout
 	call Function4e7a6
 	callba Function8cf53
 	call Function4e794
@@ -134,7 +134,7 @@ _EvolutionAnimation: ; 4e607
 .asm_4e6de
 	ret
 
-.pressed_b
+.cancel_evo
 	ld a, $1
 	ld [wd1ed], a
 
@@ -142,7 +142,7 @@ _EvolutionAnimation: ; 4e607
 	ld [PlayerHPPal], a
 
 	ld c, $0
-	call Function4e703
+	call .GetSGBLayout
 	call Function4e7a6
 	callba Function8cf53
 	call Function4e794
@@ -153,38 +153,38 @@ _EvolutionAnimation: ; 4e607
 	ret
 ; 4e703
 
-Function4e703: ; 4e703
-	ld b, $b
+.GetSGBLayout: ; 4e703
+	ld b, SCGB_0B
 	jp GetSGBLayout
 ; 4e708
 
-Function4e708: ; 4e708
+.PlaceFrontpic: ; 4e708
 	call GetBaseData
 	hlcoord 7, 2
 	jp PrepMonFrontpic
 ; 4e711
 
-Function4e711: ; 4e711
+.LoadFrontpic: ; 4e711
 	call GetBaseData
 	ld a, $1
 	ld [wc2c6], a
 	ld de, VTiles2
-	predef Function5108b
+	predef FrontpicPredef
 	xor a
 	ld [wc2c6], a
 	ret
 ; 4e726
 
-Function4e726: ; 4e726
+.AnimationSequence: ; 4e726
 	call ClearJoypad
-	lb bc, 1, 14
+	lb bc, 1, 2 * 7 ; flash b times, wait c frames in between
 .loop
 	push bc
-	call Evolution_CheckPressedB
+	call .WaitFrames_CheckPressedB
 	pop bc
-	jr c, .pressed_b
+	jr c, .exit_sequence
 	push bc
-	call Evolution_NextFrame
+	call .Flash
 	pop bc
 	inc b
 rept 2
@@ -194,31 +194,30 @@ endr
 	and a
 	ret
 
-.pressed_b
+.exit_sequence
 	scf
 	ret
 ; 4e741
 
-Evolution_NextFrame: ; 4e741
-.loop
-	ld a, -49
+.Flash: ; 4e741
+	ld a, -7 * 7 ; new stage
 	ld [wd1ec], a
-	call Evolution_FlashFrontpics
-	ld a, 49
+	call .ReplaceFrontpic
+	ld a, 7 * 7 ; previous stage
 	ld [wd1ec], a
-	call Evolution_FlashFrontpics
+	call .ReplaceFrontpic
 	dec b
-	jr nz, .loop
+	jr nz, .Flash
 	ret
 ; 4e755
 
-Evolution_FlashFrontpics: ; 4e755
+.ReplaceFrontpic: ; 4e755
 	push bc
 	xor a
 	ld [hBGMapMode], a
 	hlcoord 7, 2
 	lb bc, 7, 7
-	ld de, $d
+	ld de, SCREEN_WIDTH - 7
 .loop1
 	push bc
 .loop2
@@ -238,8 +237,7 @@ Evolution_FlashFrontpics: ; 4e755
 	ret
 ; 4e779
 
-Evolution_CheckPressedB: ; 4e779
-.loop
+.WaitFrames_CheckPressedB: ; 4e779
 	call DelayFrame
 	push bc
 	call JoyTextDelay
@@ -247,16 +245,16 @@ Evolution_CheckPressedB: ; 4e779
 	pop bc
 	and B_BUTTON
 	jr nz, .pressed_b
-.loop2
+.loop3
 	dec c
-	jr nz, .loop
+	jr nz, .WaitFrames_CheckPressedB
 	and a
 	ret
 
 .pressed_b
 	ld a, [wd1e9]
 	and a
-	jr nz, .loop2
+	jr nz, .loop3
 	scf
 	ret
 ; 4e794
@@ -281,18 +279,18 @@ Function4e7a6: ; 4e7a6
 	ld a, [hl]
 	push af
 	ld [hl], $0
-.asm_4e7b8
+.loop
 	call Function4e7cf
-	jr nc, .asm_4e7c2
+	jr nc, .done
 	call Function4e80c
-	jr .asm_4e7b8
+	jr .loop
 
-.asm_4e7c2
+.done
 	ld c, $20
-.asm_4e7c4
+.loop2
 	call Function4e80c
 	dec c
-	jr nz, .asm_4e7c4
+	jr nz, .loop2
 	pop af
 	ld [wJumptableIndex], a
 	ret
@@ -319,7 +317,7 @@ Function4e7cf: ; 4e7cf
 
 Function4e7e8: ; 4e7e8
 	push de
-	ld de, $4858
+	lb de, $48, $58
 	ld a, $13
 	call _InitSpriteAnimStruct
 	ld hl, $b
@@ -342,6 +340,7 @@ Function4e7e8: ; 4e7e8
 Function4e80c: ; 4e80c
 	push bc
 	callab Function8cf69
+	; a = (([hVBlankCounter] + 4) / 2) % NUM_PALETTES
 	ld a, [hVBlankCounter]
 	and $e
 	srl a
@@ -350,9 +349,9 @@ rept 2
 endr
 	and $7
 	ld b, a
-	ld hl, Sprites + 3
-	ld c, $28
-.asm_4e823
+	ld hl, Sprites + 3 ; attributes
+	ld c, 40
+.loop
 	ld a, [hl]
 	or b
 	ld [hli], a
@@ -360,7 +359,7 @@ rept 3
 	inc hl
 endr
 	dec c
-	jr nz, .asm_4e823
+	jr nz, .loop
 	pop bc
 	call DelayFrame
 	ret
diff --git a/engine/link.asm b/engine/link.asm
index feb4b5023..e10a3d0f6 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -495,7 +495,7 @@ Function283b2: ; 283b2
 	call PlaceWholeStringInBoxAtOnce
 	call RotateThreePalettesRight
 	call ClearScreen
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	call Function3200
 	ret
@@ -1585,7 +1585,7 @@ Function28ade: ; 28ade
 Function28b22: ; 28b22
 	call RotateThreePalettesRight
 	call ClearScreen
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	call Function3200
 	xor a
@@ -1889,7 +1889,7 @@ Function28b87: ; 28b87
 	call DelayFrames
 	call ClearTileMap
 	call LoadFontsBattleExtra
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	ld a, [hLinkPlayerNumber]
 	cp $1
@@ -2401,7 +2401,7 @@ Function2914e: ; 2914e
 	pop bc
 	ld [hl], b
 	call WaitBGMap
-	ld b, $1b
+	ld b, SCGB_1B
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
@@ -2672,7 +2672,7 @@ Function29348: ; 29348
 	lb bc, 3, 12
 	call Function297db
 	call WaitBGMap
-	ld b, $1b
+	ld b, SCGB_1B
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
@@ -2812,7 +2812,7 @@ Function2942e: ; 2942e
 	ld [TempMonDVs], a
 	ld a, [wPlayerMinimized]
 	ld [TempMonDVs + 1], a
-	ld b, $1a
+	ld b, SCGB_1A
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
@@ -2838,7 +2838,7 @@ Function29461: ; 29461
 	ld [TempMonDVs], a
 	ld a, [wPlayerWrapCount]
 	ld [TempMonDVs + 1], a
-	ld b, $1a
+	ld b, SCGB_1A
 	call GetSGBLayout
 	ld a, $e4
 	call DmgToCgbBGPals
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index c62dc1a0f..93cd97199 100755
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -41,7 +41,7 @@ NamingScreen: ; 116c1
 
 Function116f8: ; 116f8
 	call ClearBGPalettes
-	ld b, $8
+	ld b, SCGB_08
 	call GetSGBLayout
 	call DisableLCD
 	call Function11c51
diff --git a/engine/party_menu.asm b/engine/party_menu.asm
index 356b07f8e..06b774064 100644
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -20,7 +20,7 @@ Function5001d: ; 5001d
 	call ClearBGPalettes
 	call Function5003f
 	call WaitBGMap
-	ld b, $a
+	ld b, SCGB_0A
 	call GetSGBLayout
 	call SetPalettes
 	call DelayFrame
@@ -149,7 +149,7 @@ PlacePartyHPBar: ; 500cf
 	ld b, $0
 	add hl, bc
 	call SetHPPal
-	ld b, $fc
+	ld b, SCGB_FC
 	call GetSGBLayout
 
 .skip
@@ -162,7 +162,7 @@ PlacePartyHPBar: ; 500cf
 	inc b
 	dec c
 	jr nz, .loop
-	ld b, $a
+	ld b, SCGB_0A
 	call GetSGBLayout
 	ret
 ; 50117
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 080647895..656e1767b 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -2363,7 +2363,7 @@ Function41401: ; 41401 (10:5401)
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld bc, $40
 	xor a
 	call ByteFill
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 2aaf0d74e..da6006853 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -1952,7 +1952,7 @@ _FlyMap: ; 91af3
 	call Request1bpp
 	call FlyMap
 	call Function91c8f
-	ld b, $2
+	ld b, SCGB_02
 	call GetSGBLayout
 	call SetPalettes
 .loop
@@ -2378,7 +2378,7 @@ Function91d11: ; 91d11
 	call TownMapPals
 	hlbgcoord 0, 0
 	call TownMapBGUpdate
-	ld b, $2
+	ld b, SCGB_02
 	call GetSGBLayout
 	call SetPalettes
 	xor a
diff --git a/engine/predef.asm b/engine/predef.asm
index 213cfc352..90a60c800 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -92,7 +92,7 @@ PredefPointers:: ; 856b
 	add_predef PartyMonItemName
 	add_predef GetFrontpic
 	add_predef GetBackpic
-	add_predef Function5108b
+	add_predef FrontpicPredef
 	add_predef GetTrainerPic
 	add_predef DecompressPredef ; $40
 	add_predef CheckTypeMatchup
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index dab0e2361..afd038588 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -28,9 +28,9 @@ Function926f7: ; 926f7 (24:66f7)
 	call DisableLCD
 	hlbgcoord 0, 0
 	lb bc, 4, 0
-	ld a, $7f
+	ld a, " "
 	call ByteFill
-	ld b, $5
+	ld b, SCGB_05
 	call GetSGBLayout
 	callab Function8cf53
 	ld hl, wc6d0
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index ba5e2330c..a40aa734e 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -1795,7 +1795,7 @@ SetUpMoveScreenBG: ; 13172
 	call PrintLevel
 	ld hl, PlayerHPPal
 	call SetHPPal
-	ld b, $e
+	ld b, SCGB_0E
 	call GetSGBLayout
 	hlcoord 16, 0
 	lb bc, 1, 3
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm
index 11c6f61ce..766e05fe7 100755
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -848,7 +848,7 @@ Function4e289: ; 4e289 (13:6289)
 	ret c
 	call Function4e307
 	ld de, VTiles2 tile $00
-	predef Function5108b
+	predef FrontpicPredef
 	hlcoord 0, 0
 	ld d, $0
 	ld e, $2
@@ -1051,7 +1051,7 @@ Function4e497: ; 4e497 (13:6497)
 	ld [wc2c6], a
 	call Function4e307
 	ld de, VTiles2 tile $00
-	predef Function5108b
+	predef FrontpicPredef
 	pop de
 	hlcoord 0, 0
 	ld d, $0
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm
index fac580f41..b977772eb 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/timeofdaypals.asm
@@ -39,7 +39,7 @@ _TimeOfDayPals:: ; 8c011
 
 
 ; save bg palette 8
-	ld hl, wMapPals + 8 * 7 ; wMapPals + 7 pals
+	ld hl, UnknBGPals + 8 * 7 ; UnknBGPals + 7 pals
 
 ; save wram bank
 	ld a, [rSVBK]
@@ -65,12 +65,12 @@ _TimeOfDayPals:: ; 8c011
 
 
 ; update sgb pals
-	ld b, $9
+	ld b, SCGB_09
 	call GetSGBLayout
 
 
 ; restore bg palette 8
-	ld hl, Unkn2Pals - 1 ; last byte in wMapPals
+	ld hl, UnknOBPals - 1 ; last byte in UnknBGPals
 
 ; save wram bank
 	ld a, [rSVBK]
@@ -172,12 +172,12 @@ Function8c0c1: ; 8c0c1
 	push af
 	ld a, $5
 	ld [rSVBK], a
-	ld hl, wMapPals
+	ld hl, UnknBGPals
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]
 	ld d, a
-	ld hl, wMapPals + 8
+	ld hl, UnknBGPals + 8
 	ld c, $6
 .asm_8c0d4
 	ld a, e
diff --git a/engine/title.asm b/engine/title.asm
index fc8dfa0e4..0812ec0ec 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -144,7 +144,7 @@ _TitleScreen: ; 10ed67
 	
 ; Update palette colors
 	ld hl, TitleScreenPalettes
-	ld de, wMapPals
+	ld de, UnknBGPals
 	ld bc, 4 * 32
 	call CopyBytes
 	
@@ -220,7 +220,7 @@ _TitleScreen: ; 10ed67
 	ld [hBGMapMode], a
 	
 	xor a
-	ld [wMapPals + 2], a
+	ld [UnknBGPals + 2], a
 	
 ; Play starting sound effect
 	call SFXChannelsOff
@@ -231,7 +231,7 @@ _TitleScreen: ; 10ed67
 ; 10eea7
 
 SuicuneFrameIterator: ; 10eea7
-	ld hl, wMapPals + 2
+	ld hl, UnknBGPals + 2
 	ld a, [hl]
 	ld c, a
 	inc [hl]