Merge pull request #60 from mid-kid/master

Rub a dub dub, thanks for the grub

25 files changed, 124 insertions, 116 deletions

diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm
index 3dcf302c..e840facc 100644
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -59,7 +59,8 @@ Music_LookYoungster_Ch1:
 	rest 1
 	rest 16
 	sound_loop 0, .mainloop
-	sound_ret
+
+	sound_ret ; unused
 
 Music_LookYoungster_Ch2:
 	stereo_panning TRUE, FALSE
@@ -156,7 +157,8 @@ Music_LookYoungster_Ch2:
 	note C_, 1
 	rest 1
 	sound_loop 0, .mainloop
-	sound_ret
+
+	sound_ret ; unused
 
 Music_LookYoungster_Ch3:
 	stereo_panning TRUE, TRUE
@@ -290,4 +292,5 @@ Music_LookYoungster_Ch3:
 	note G#, 1
 	rest 1
 	sound_loop 0, .mainloop
-	sound_ret
+
+	sound_ret ; unused
diff --git a/charmap.asm b/charmap.asm
index a3616d85..73af5a6e 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -281,6 +281,7 @@
 	charmap "「", $70
 	charmap "」", $71
 	charmap "』", $73
+	charmap "・", $74
 	charmap "⋯", $75
 
 	charmap "　", $7f
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 0685a4ea..cc324922 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -600,7 +600,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
 	ld a, PAL_BG_TEXT
 	call ByteFill
 
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	call DelayFrame
 	call CGBOnly_CopyTilemapAtOnce
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 20041a32..21f15db9 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1300,7 +1300,7 @@ BattleAnim_SetBGPals:
 	ld b, a
 	ld c, 2
 	call CopyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -1315,7 +1315,7 @@ BattleAnim_SetOBPals:
 	ld b, a
 	ld c, 2
 	call CopyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index fb29aad6..37040efd 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -2502,7 +2502,7 @@ BGEffects_LoadBGPal0_OBPal1:
 	ld c, $1
 	call CopyPals
 	pop bc
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -2521,7 +2521,7 @@ BGEffects_LoadBGPal1_OBPal0:
 	ld c, $1
 	call CopyPals
 	pop bc
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm
index 204703d9..8d85dd1a 100644
--- a/engine/debug/color_picker.asm
+++ b/engine/debug/color_picker.asm
@@ -457,7 +457,7 @@ Functionfd646:
 	hlcoord 15, 2
 	ld de, wc508 + 2
 	call Functionfd6b0
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ld a, 3
 	ld [wJumptableIndex], a
@@ -1229,7 +1229,7 @@ Functionfdc98:
 	hlcoord 16, 0
 	ld de, wc508 + 6
 	call Functionfd6b0
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	call DelayFrame
 	ret
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 002d4ad4..7cf2f03a 100644
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -166,7 +166,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
 	ld de, wOBPals2 palette PAL_OW_TREE
 	ld bc, 1 palettes
 	call CopyBytes
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -223,7 +223,7 @@ INCLUDE "gfx/overworld/heal_machine.pal"
 	ld a, e
 	ld [hl], a
 
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm
index 2752f5a7..9ef8b99e 100644
--- a/engine/events/poisonstep_pals.asm
+++ b/engine/events/poisonstep_pals.asm
@@ -33,7 +33,7 @@ LoadPoisonBGPals:
 	ld [hli], a
 	dec c
 	jr nz, .loop
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ld c, 4
 	call DelayFrames
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 97180f7f..d62fdaf0 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -158,7 +158,7 @@ _CGB_PokegearPals:
 	ld bc, 6 palettes
 	call CopyBytes
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -211,7 +211,7 @@ _CGB_StatsScreenHPPals:
 
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -264,7 +264,7 @@ _CGB_Pokedex_Resume:
 	call CopyBytes
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -299,7 +299,7 @@ _CGB_BillsPC:
 	call InitPartyMenuOBPals
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -321,7 +321,7 @@ Function95a0:
 	call InitPartyMenuOBPals
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -344,7 +344,7 @@ _CGB_PokedexUnownMode:
 	call InitPartyMenuOBPals
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -396,7 +396,7 @@ _CGB_SlotMachine:
 	call ByteFill
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -414,7 +414,7 @@ _CGB_BetaTitleScreen:
 	call FillBoxCGB
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -548,7 +548,7 @@ _CGB_Evolution:
 	call WipeAttrmap
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -564,7 +564,7 @@ _CGB_GSTitleScreen:
 	ld a, SCGB_DIPLOMA
 	ld [wDefaultSGBLayout], a
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -664,7 +664,7 @@ _CGB_TrainerCard:
 	call FillBoxCGB
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -688,7 +688,7 @@ _CGB_MoveList:
 	call FillBoxCGB
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -698,7 +698,7 @@ _CGB_BetaPikachuMinigame:
 	call WipeAttrmap
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -710,7 +710,7 @@ _CGB_PokedexSearchOption:
 	call WipeAttrmap
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -742,7 +742,7 @@ _CGB_PackPals:
 	call FillBoxCGB
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -798,7 +798,7 @@ _CGB_MagnetTrain:
 	call FillBoxCGB
 	call ApplyAttrmap
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index bf6ac5a2..18f3fa4c 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -156,7 +156,7 @@ Function9102:
 	call CopyBytes
 
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -321,7 +321,7 @@ ApplyHPBarPals:
 	add hl, bc
 	ld bc, 4
 	call CopyBytes
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
@@ -359,7 +359,7 @@ LoadStatsScreenPals:
 	ld [wBGPals1 palette 0 + 1], a
 	ld [wBGPals1 palette 2 + 1], a
 	call ApplyPals
-	ld a, $1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index cced6ae6..fd5fb020 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -775,12 +775,12 @@ IF DEF(_GOLD)
 	ld a, [hl]
 	sla a
 	sla a
-	ld d, $2
 
+	ld d, 2
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
-	add $3
+	add 3
 	ld [hl], a
 	call .Sprites_Sine
 
@@ -840,11 +840,11 @@ ENDC
 IF DEF(_GOLD)
 	inc a
 	ld [hl], a
-	ld d, $2
+	ld d, 2
 ELIF DEF(_SILVER)
 	dec a
 	ld [hl], a
-	ld d, $8
+	ld d, 8
 ENDC
 	call .Sprites_Sine
 
@@ -1118,7 +1118,7 @@ ENDC
 	inc [hl]
 .move_vertical
 	ld a, e
-	ld d, $20
+	ld d, 32
 	call .Sprites_Sine
 
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
@@ -1183,10 +1183,10 @@ ENDC
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
-	cp $30
+	cp 48
 	jr c, .asm_8da7b
 	dec [hl]
-	ld d, $28
+	ld d, 40
 	call .Sprites_Sine
 
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
@@ -1219,8 +1219,8 @@ ENDC
 	ld a, [hl]
 	and a
 	jr z, .asm_8daca
-	ld d, a
 
+	ld d, a
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
 	ld a, [hl]
diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm
index 13ea14d0..d902ff59 100644
--- a/engine/gfx/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -135,16 +135,16 @@ _InitSpriteAnimStruct::
 ; Back up the structure address to bc.
 	ld c, l
 	ld b, h
-; Value [wSpriteAnimCount] is initially set to -1. Set it to
-; the number of objects loaded into this array.
+
+; Increment [wSpriteAnimCount], skipping a 0 value.
 	ld hl, wSpriteAnimCount
 	inc [hl]
 	ld a, [hl]
 	and a
-	jr nz, .initialized
+	jr nz, .nonzero
 	inc [hl]
+.nonzero
 
-.initialized
 ; Get row a of SpriteAnimSeqData, copy the pointer into de
 	pop af
 	ld e, a
@@ -215,9 +215,9 @@ DeinitializeSprite:
 UpdateAnimFrame:
 	call InitSpriteAnimBuffer ; init WRAM
 	call GetSpriteAnimFrame ; read from a memory array
-	cp -3
+	cp dowait_command
 	jr z, .done
-	cp -4
+	cp delanim_command
 	jr z, .delete
 	call GetFrameOAMPointer
 	; add byte to [wCurAnimVTile]
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 24febe66..8cd5e864 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1112,7 +1112,7 @@ EvoStoneEffect:
 	cp EVERSTONE
 	jr z, .NoEffect
 
-	ld a, $1
+	ld a, TRUE
 	ld [wForceEvolution], a
 	farcall EvolvePokemon
 
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
index 3fdc42cd..b00f72fb 100644
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -839,6 +839,15 @@ Intro_PlaceChrisSprite:
 	db 10 * 8 + 4,  9 * 8, 2
 	db 10 * 8 + 4, 10 * 8, 3
 
+
+	const_def
+	const TITLESCREENOPTION_MAIN_MENU
+	const TITLESCREENOPTION_DELETE_SAVE_DATA
+	const TITLESCREENOPTION_RESTART
+	const TITLESCREENOPTION_UNUSED
+	const TITLESCREENOPTION_RESET_CLOCK
+NUM_TITLESCREENOPTIONS EQU const_value
+
 IntroSequence:
 	callfar Copyright_GameFreakPresents
 	jr c, StartTitleScreen
@@ -864,8 +873,8 @@ StartTitleScreen:
 	ld b, SCGB_DIPLOMA
 	call GetSGBLayout
 	call UpdateTimePals
-	ld a, [wIntroSceneFrameCounter]
-	cp $5
+	ld a, [wTitleScreenSelectedOption]
+	cp NUM_TITLESCREENOPTIONS
 	jr c, .ok
 	xor a
 .ok
@@ -986,7 +995,7 @@ TitleScreenMain:
 	ld a, [hl]
 	and D_DOWN + B_BUTTON + SELECT
 	cp  D_DOWN + B_BUTTON + SELECT
-	jr z, .clock_reset
+	jr z, .reset_clock
 
 ; Press Start or A to start the game.
 	ld a, [hl]
@@ -995,14 +1004,14 @@ TitleScreenMain:
 	ret
 
 .incave
-	ld a, 0
+	ld a, TITLESCREENOPTION_MAIN_MENU
 	jr .done
 
 .delete_save_data
-	ld a, 1
+	ld a, TITLESCREENOPTION_DELETE_SAVE_DATA
 
 .done
-	ld [wIntroSceneFrameCounter], a
+	ld [wTitleScreenSelectedOption], a
 
 ; Return to the intro sequence.
 	ld hl, wJumptableIndex
@@ -1025,9 +1034,9 @@ TitleScreenMain:
 	inc [hl]
 	ret
 
-.clock_reset
-	ld a, 4
-	ld [wIntroSceneFrameCounter], a
+.reset_clock
+	ld a, TITLESCREENOPTION_RESET_CLOCK
+	ld [wTitleScreenSelectedOption], a
 
 ; Return to the intro sequence.
 	ld hl, wJumptableIndex
@@ -1044,8 +1053,8 @@ TitleScreenEnd:
 	and a
 	ret nz
 
-	ld a, 2
-	ld [wIntroSceneFrameCounter], a
+	ld a, TITLESCREENOPTION_RESTART
+	ld [wTitleScreenSelectedOption], a
 
 ; Back to the intro.
 	ld hl, wJumptableIndex
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index cfcf8c62..af095f3a 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -64,7 +64,7 @@ TitleScreen:
 	xor a
 	ld hl, wJumptableIndex
 	ld [hli], a ; wJumptableIndex
-	ld [hli], a ; wIntroSceneFrameCounter
+	ld [hli], a ; wTitleScreenSelectedOption
 	ld [hli], a ; wTitleScreenTimer
 	ld [hl], a  ; wTitleScreenTimer + 1
 
diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm
index 27af019d..2cc8c1bb 100644
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -224,7 +224,7 @@ endr
 .loop3
 	; Choose one of the middle three Pokemon.
 	call Random
-	and NUM_GRASSMON
+	maskbits NUM_GRASSMON
 	cp 2
 	jr c, .loop3
 	cp 5
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 4510a5a2..745d3936 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -810,8 +810,8 @@ ChooseMoveToDelete:
 
 .ChooseMoveToDelete
 	call SetUpMoveScreenBG
-	ld de, DeleteMoveScreenAttrs
-	call SetMenuAttributes
+	ld de, DeleteMoveScreen2DMenuData
+	call Load2DMenuData
 	call SetUpMoveList
 	ld hl, w2DMenuFlags1
 	set 6, [hl]
@@ -847,12 +847,12 @@ ChooseMoveToDelete:
 	pop af
 	ret
 
-DeleteMoveScreenAttrs:
-	db 3, 1
-	db 3, 1
-	db $40, $00
-	dn 2, 0
-	db D_UP | D_DOWN | A_BUTTON | B_BUTTON
+DeleteMoveScreen2DMenuData:
+	db 3, 1 ; cursor start y, x
+	db 3, 1 ; rows, columns
+	db $40, $00 ; flags
+	dn 2, 0 ; cursor offset
+	db D_UP | D_DOWN | A_BUTTON | B_BUTTON ; accepted buttons
 
 ManagePokemonMoves:
 	ld a, [wCurPartySpecies]
@@ -877,8 +877,8 @@ MoveScreenLoop:
 	ld [wPartyMenuCursor], a
 	call SetUpMoveScreenBG
 	call PlaceMoveScreenArrows
-	ld de, MoveScreenAttributes
-	call SetMenuAttributes
+	ld de, MoveScreen2DMenuData
+	call Load2DMenuData
 .loop
 	call SetUpMoveList
 	ld hl, w2DMenuFlags1
@@ -1076,12 +1076,12 @@ MoveScreenLoop:
 	call ClearSprites
 	jp ClearTilemap
 
-MoveScreenAttributes:
-	db 3, 1
-	db 3, 1
-	db $40, $00
-	dn 2, 0
-	db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
+MoveScreen2DMenuData:
+	db 3, 1 ; cursor start y, x
+	db 3, 1 ; rows, columns
+	db $40, $00 ; flags
+	dn 2, 0 ; cursor offsets
+	db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ; accepted buttons
 
 String_MoveWhere:
 	db "Where?@"
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
index 9398ae5e..1f63ba12 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -534,8 +534,8 @@ InitPartyMenuWithCancel:
 ; with cancel
 	xor a
 	ld [wSwitchMon], a
-	ld de, PartyMenuAttributes
-	call SetMenuAttributes
+	ld de, PartyMenu2DMenuData
+	call Load2DMenuData
 	ld a, [wPartyCount]
 	inc a
 	ld [w2DMenuNumRows], a ; list length
@@ -559,8 +559,8 @@ InitPartyMenuWithCancel:
 
 InitPartyMenuNoCancel:
 ; no cancel
-	ld de, PartyMenuAttributes
-	call SetMenuAttributes
+	ld de, PartyMenu2DMenuData
+	call Load2DMenuData
 	ld a, [wPartyCount]
 	ld [w2DMenuNumRows], a ; list length
 	ld b, a
@@ -578,20 +578,12 @@ InitPartyMenuNoCancel:
 	ld [wMenuJoypadFilter], a
 	ret
 
-PartyMenuAttributes:
-; cursor y
-; cursor x
-; num rows
-; num cols
-; bit 6: animate sprites  bit 5: wrap around
-; ?
-; distance between items (hi: y, lo: x)
-; allowed buttons (mask)
-	db 1, 0
-	db 0, 1
-	db $60, $00
-	dn 2, 0
-	db 0
+PartyMenu2DMenuData:
+	db 1, 0 ; cursor start y, x
+	db 0, 1 ; rows, columns
+	db $60, $00 ; flags
+	dn 2, 0 ; cursor offset
+	db 0 ; accepted buttons
 
 PartyMenuSelect:
 ; sets carry if exitted menu.
diff --git a/home/menu.asm b/home/menu.asm
index 3370ff0d..7bc6454d 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -1,20 +1,22 @@
-SetMenuAttributes::
+Load2DMenuData::
 	push hl
 	push bc
-	ld hl, w2DMenuCursorInitY
-	ld b, $8
+	ld hl, w2DMenuData
+	ld b, w2DMenuDataEnd - w2DMenuData
 .loop
 	ld a, [de]
 	inc de
 	ld [hli], a
 	dec b
 	jr nz, .loop
+
+	; Reset menu state
 	ld a, $1
-	ld [hli], a
-	ld [hli], a
+	ld [hli], a ; wMenuCursorY
+	ld [hli], a ; wMenuCursorX
 	xor a
-	ld [hli], a
-	ld [hli], a
+	ld [hli], a ; wCursorOffCharacter
+	ld [hli], a ; wCursorCurrentTile
 	ld [hli], a
 	pop bc
 	pop hl
diff --git a/home/palettes.asm b/home/palettes.asm
index 6eec53ef..af7f7ba7 100644
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -81,7 +81,7 @@ DmgToCgbBGPals::
 	ld c, 8
 	call CopyPals
 ; request pal update
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 
 	pop bc
@@ -120,7 +120,7 @@ DmgToCgbObjPals::
 	ld c, 8
 	call CopyPals
 ; request pal update
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 
 	pop bc
@@ -147,7 +147,7 @@ DmgToCgbObjPal0::
 	ld b, a
 	ld c, 1
 	call CopyPals
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 
 	pop bc
@@ -176,7 +176,7 @@ DmgToCgbObjPal1::
 	ld b, a
 	ld c, 1
 	call CopyPals
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 
 	pop bc
@@ -282,7 +282,7 @@ ReloadSpritesNoPalettes::
 	ld bc, (8 palettes) + (2 palettes)
 	xor a
 	call ByteFill
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	call DelayFrame
 	ret
diff --git a/home/text.asm b/home/text.asm
index f7fadd5e..9d3428ac 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -614,7 +614,7 @@ TextCommands::
 	dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON
 	dw TextCommand_SCROLL        ; TX_SCROLL
 	dw TextCommand_START_ASM     ; TX_START_ASM
-	dw TextCommand_NUM           ; TX_NUM
+	dw TextCommand_DECIMAL       ; TX_DECIMAL
 	dw TextCommand_PAUSE         ; TX_PAUSE
 	dw TextCommand_SOUND         ; TX_SOUND_DEX_FANFARE_50_79
 	dw TextCommand_DOTS          ; TX_DOTS
@@ -758,8 +758,8 @@ TextCommand_START_ASM::
 ; run assembly code
 	jp hl
 
-TextCommand_NUM::
-; print a number
+TextCommand_DECIMAL::
+; print a decimal number
 	ld a, [hli]
 	ld e, a
 	ld a, [hli]
diff --git a/home/tilemap.asm b/home/tilemap.asm
index ddd32d9e..f65a0d5b 100644
--- a/home/tilemap.asm
+++ b/home/tilemap.asm
@@ -180,7 +180,7 @@ ClearPalettes::
 	ld a, $ff
 	call ByteFill
 ; Request palette update
-	ld a, 1
+	ld a, TRUE
 	ldh [hCGBPalUpdate], a
 	ret
 
diff --git a/hram.asm b/hram.asm
index 2b3c07f2..edc9599c 100644
--- a/hram.asm
+++ b/hram.asm
@@ -86,7 +86,7 @@ hPrintNumBuffer:: ds 10
 
 NEXTU
 ; miscellaneous
-    ds 9
+	ds 9
 hMGStatusFlags:: db
 ENDU
 
diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm
index 2622cee5..f45b7fd1 100644
--- a/macros/scripts/text.asm
+++ b/macros/scripts/text.asm
@@ -61,9 +61,9 @@ text_asm: MACRO
 	db TX_START_ASM
 ENDM
 
-	const TX_NUM ; $09
+	const TX_DECIMAL ; $09
 text_decimal: MACRO
-	db TX_NUM
+	db TX_DECIMAL
 	dw \1 ; address
 	dn \2, \3 ; bytes, digits
 ENDM
diff --git a/wram.asm b/wram.asm
index 3f490f0e..6a3ff5b0 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1151,13 +1151,14 @@ wce65:: db
 wce66:: db
 
 NEXTU
-; gfpresents, title, and intro menu timers
+; intro data
 wIntroSceneFrameCounter:: db
-UNION
 wIntroSceneTimer:: db
+
 NEXTU
+; title data
+wTitleScreenSelectedOption:: db
 wTitleScreenTimer:: dw
-ENDU
 
 NEXTU
 ; credits data