Replace hardware_constants.asm with hardware.inc (#511)

32 files changed, 149 insertions, 149 deletions

diff --git a/home/audio.asm b/home/audio.asm
index c9d8b983..c01519f4 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -172,7 +172,7 @@ PlaySound::
 	ldh [hSavedROMBank], a
 	ld a, [wAudioROMBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	cp BANK(Audio1_PlaySound)
 	jr nz, .checkForAudio2
 ; audio 1
@@ -195,7 +195,7 @@ PlaySound::
 .next2
 	ldh a, [hSavedROMBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	jr .done
 
 .fadeOut
diff --git a/home/bankswitch.asm b/home/bankswitch.asm
index 52c8a45c..2ce363b7 100644
--- a/home/bankswitch.asm
+++ b/home/bankswitch.asm
@@ -6,14 +6,14 @@ BankswitchHome::
 	ld [wBankswitchHomeSavedROMBank], a
 	ld a, [wBankswitchHomeTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 BankswitchBack::
 ; returns from BankswitchHome
 	ld a, [wBankswitchHomeSavedROMBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 Bankswitch::
@@ -23,7 +23,7 @@ Bankswitch::
 	push af
 	ld a, b
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld bc, .Return
 	push bc
 	jp hl
@@ -31,5 +31,5 @@ Bankswitch::
 	pop bc
 	ld a, b
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
diff --git a/home/copy.asm b/home/copy.asm
index 880d1fb7..4bd1be50 100644
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -5,11 +5,11 @@ FarCopyData::
 	push af
 	ld a, [wBuffer]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call CopyData
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 CopyData::
diff --git a/home/copy2.asm b/home/copy2.asm
index 1c9a56f3..06c45b59 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -6,11 +6,11 @@ FarCopyData2::
 	push af
 	ldh a, [hROMBankTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call CopyData
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 FarCopyData3::
@@ -20,7 +20,7 @@ FarCopyData3::
 	push af
 	ldh a, [hROMBankTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	push hl
 	push de
 	push de
@@ -32,7 +32,7 @@ FarCopyData3::
 	pop hl
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 FarCopyDataDouble::
@@ -43,7 +43,7 @@ FarCopyDataDouble::
 	push af
 	ldh a, [hROMBankTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 .loop
 	ld a, [hli]
 	ld [de], a
@@ -56,7 +56,7 @@ FarCopyDataDouble::
 	jr nz, .loop
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 CopyVideoData::
@@ -74,7 +74,7 @@ CopyVideoData::
 
 	ld a, b
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	ld a, e
 	ldh [hVBlankCopySource], a
@@ -96,7 +96,7 @@ CopyVideoData::
 	call DelayFrame
 	ldh a, [hROMBankTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	pop af
 	ldh [hAutoBGTransferEnabled], a
 	ret
@@ -123,7 +123,7 @@ CopyVideoDataDouble::
 
 	ld a, b
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	ld a, e
 	ldh [hVBlankCopyDoubleSource], a
@@ -145,7 +145,7 @@ CopyVideoDataDouble::
 	call DelayFrame
 	ldh a, [hROMBankTemp]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	pop af
 	ldh [hAutoBGTransferEnabled], a
 	ret
diff --git a/home/fade_audio.asm b/home/fade_audio.asm
index b09d0036..a78ee210 100644
--- a/home/fade_audio.asm
+++ b/home/fade_audio.asm
@@ -6,7 +6,7 @@ FadeOutAudio::
 	bit BIT_NO_AUDIO_FADE_OUT, a
 	ret nz
 	ld a, $77
-	ldh [rNR50], a
+	ldh [rAUDVOL], a
 	ret
 .fadingOut
 	ld a, [wAudioFadeOutCounter]
@@ -18,7 +18,7 @@ FadeOutAudio::
 .counterReachedZero
 	ld a, [wAudioFadeOutCounterReloadValue]
 	ld [wAudioFadeOutCounter], a
-	ldh a, [rNR50]
+	ldh a, [rAUDVOL]
 	and a ; has the volume reached 0?
 	jr z, .fadeOutComplete
 	ld b, a
@@ -31,7 +31,7 @@ FadeOutAudio::
 	dec a
 	swap a
 	or c
-	ldh [rNR50], a
+	ldh [rAUDVOL], a
 	ret
 .fadeOutComplete
 	ld a, [wAudioFadeOutControl]
diff --git a/home/hidden_objects.asm b/home/hidden_objects.asm
index 2e3510b0..bb513b9d 100644
--- a/home/hidden_objects.asm
+++ b/home/hidden_objects.asm
@@ -5,18 +5,18 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
 	ldh a, [hLoadedROMBank]
 	push af
 	ldh a, [hJoyHeld]
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jr z, .nothingFound
 ; A button is pressed
 	ld a, BANK(CheckForHiddenObject)
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ldh [hLoadedROMBank], a
 	call CheckForHiddenObject
 	ldh a, [hDidntFindAnyHiddenObject]
 	and a
 	jr nz, .hiddenObjectNotFound
 	ld a, [wHiddenObjectFunctionRomBank]
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ldh [hLoadedROMBank], a
 	ld de, .returnAddress
 	push de
@@ -34,6 +34,6 @@ CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
 .done
 	ldh [hItemAlreadyFound], a
 	pop af
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ldh [hLoadedROMBank], a
 	ret
diff --git a/home/init.asm b/home/init.asm
index ab85192d..67fa3ab1 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -16,7 +16,7 @@ Init::
 ; * 8x8 OBJ size
 ; * OBJ display enabled
 ; * BG display enabled
-DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 << rLCDC_WINDOW_ENABLE) | (1 << rLCDC_SPRITES_ENABLE) | (1 << rLCDC_BG_PRIORITY)
+DEF LCDC_DEFAULT EQU LCDC_ON | LCDC_WIN_9C00 | LCDC_WIN_ON | LCDC_BLOCK21 | LCDC_BG_9800 | LCDC_OBJ_8 | LCDC_OBJ_ON | LCDC_BG_ON
 
 	di
 
@@ -35,7 +35,7 @@ DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 <<
 	ldh [rOBP0], a
 	ldh [rOBP1], a
 
-	ld a, 1 << rLCDC_ENABLE
+	ld a, LCDC_ON
 	ldh [rLCDC], a
 	call DisableLCD
 
@@ -61,7 +61,7 @@ DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 <<
 
 	ld a, BANK(WriteDMACodeToHRAM)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call WriteDMACodeToHRAM
 
 	xor a
@@ -70,7 +70,7 @@ DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 <<
 	ldh [hSCX], a
 	ldh [hSCY], a
 	ldh [rIF], a
-	ld a, 1 << VBLANK + 1 << TIMER + 1 << SERIAL
+	ld a, IE_VBLANK | IE_TIMER | IE_SERIAL
 	ldh [rIE], a
 
 	ld a, 144 ; move the window off-screen
@@ -87,7 +87,7 @@ DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 <<
 	ld h, HIGH(vBGMap1)
 	call ClearBgMap
 
-	ld a, rLCDC_DEFAULT
+	ld a, LCDC_DEFAULT
 	ldh [rLCDC], a
 	ld a, 16
 	ldh [hSoftReset], a
@@ -113,7 +113,7 @@ DEF rLCDC_DEFAULT EQU (1 << rLCDC_ENABLE) | (1 << rLCDC_WINDOW_TILEMAP) | (1 <<
 	call ClearVram
 	call GBPalNormal
 	call ClearSprites
-	ld a, rLCDC_DEFAULT
+	ld a, LCDC_DEFAULT
 	ldh [rLCDC], a
 
 	jp PrepareTitleScreen
diff --git a/home/item.asm b/home/item.asm
index 9e7f02f9..693f041e 100644
--- a/home/item.asm
+++ b/home/item.asm
@@ -23,12 +23,12 @@ TossItem::
 	push af
 	ld a, BANK(TossItem_)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call TossItem_
 	pop de
 	ld a, d
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; checks if an item is a key item
diff --git a/home/item_price.asm b/home/item_price.asm
index a71f655f..96b1ef31 100644
--- a/home/item_price.asm
+++ b/home/item_price.asm
@@ -10,7 +10,7 @@ GetItemPrice::
 	ld a, $f ; hardcoded Bank
 .ok
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld hl, wItemPrices
 	ld a, [hli]
 	ld h, [hl]
@@ -34,11 +34,11 @@ GetItemPrice::
 .getTMPrice
 	ld a, BANK(GetMachinePrice)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call GetMachinePrice
 .done
 	ld de, hItemPrice
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
diff --git a/home/joypad2.asm b/home/joypad2.asm
index 139dd3f5..a07b9ee4 100644
--- a/home/joypad2.asm
+++ b/home/joypad2.asm
@@ -40,7 +40,7 @@ JoypadLowSensitivity::
 .delayOver
 ; if [hJoy6] = 0 and A or B is pressed, report no buttons as pressed
 	ldh a, [hJoyHeld]
-	and A_BUTTON | B_BUTTON
+	and PAD_A | PAD_B
 	jr z, .setShortDelay
 	ldh a, [hJoy6] ; flag
 	and a
@@ -74,7 +74,7 @@ WaitForTextScrollButtonPress::
 	call JoypadLowSensitivity
 	predef CableClub_Run
 	ldh a, [hJoy5]
-	and A_BUTTON | B_BUTTON
+	and PAD_A | PAD_B
 	jr z, .loop
 	pop af
 	ldh [hDownArrowBlinkCount2], a
diff --git a/home/lcd.asm b/home/lcd.asm
index aef6d43f..1e9e8888 100644
--- a/home/lcd.asm
+++ b/home/lcd.asm
@@ -3,16 +3,16 @@ DisableLCD::
 	ldh [rIF], a
 	ldh a, [rIE]
 	ld b, a
-	res rIE_VBLANK, a
+	res B_IE_VBLANK, a
 	ldh [rIE], a
 
 .wait
 	ldh a, [rLY]
-	cp LY_VBLANK
+	cp LY_VBLANK + 1
 	jr nz, .wait
 
 	ldh a, [rLCDC]
-	and ~(1 << rLCDC_ENABLE)
+	and ~LCDC_ON
 	ldh [rLCDC], a
 	ld a, b
 	ldh [rIE], a
@@ -20,6 +20,6 @@ DisableLCD::
 
 EnableLCD::
 	ldh a, [rLCDC]
-	set rLCDC_ENABLE, a
+	set B_LCDC_ENABLE, a
 	ldh [rLCDC], a
 	ret
diff --git a/home/list_menu.asm b/home/list_menu.asm
index aae7caad..b7204e65 100644
--- a/home/list_menu.asm
+++ b/home/list_menu.asm
@@ -50,7 +50,7 @@ DisplayListMenuID::
 	ld [wTopMenuItemY], a
 	ld a, 5
 	ld [wTopMenuItemX], a
-	ld a, A_BUTTON | B_BUTTON | SELECT
+	ld a, PAD_A | PAD_B | PAD_SELECT
 	ld [wMenuWatchedKeys], a
 	ld c, 10
 	call DelayFrames
@@ -84,7 +84,7 @@ DisplayListMenuIDLoop::
 	push af
 	call PlaceMenuCursor
 	pop af
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jp z, .checkOtherKeys
 .buttonAPressed
 	ld a, [wCurrentMenuItem]
@@ -170,12 +170,12 @@ DisplayListMenuIDLoop::
 	res BIT_NO_TEXT_DELAY, [hl]
 	jp BankswitchBack
 .checkOtherKeys ; check B, SELECT, Up, and Down keys
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	jp nz, ExitListMenu ; if so, exit the menu
-	bit BIT_SELECT, a
+	bit B_PAD_SELECT, a
 	jp nz, HandleItemListSwapping ; if so, allow the player to swap menu entries
 	ld b, a
-	bit BIT_D_DOWN, b
+	bit B_PAD_DOWN, b
 	ld hl, wListScrollOffset
 	jr z, .upPressed
 .downPressed
@@ -222,13 +222,13 @@ DisplayChooseQuantityMenu::
 .waitForKeyPressLoop
 	call JoypadLowSensitivity
 	ldh a, [hJoyPressed] ; newly pressed buttons
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jp nz, .buttonAPressed
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	jp nz, .buttonBPressed
-	bit BIT_D_UP, a
+	bit B_PAD_UP, a
 	jr nz, .incrementQuantity
-	bit BIT_D_DOWN, a
+	bit B_PAD_DOWN, a
 	jr nz, .decrementQuantity
 	jr .waitForKeyPressLoop
 .incrementQuantity
diff --git a/home/load_font.asm b/home/load_font.asm
index 0f48e84c..e886f76e 100644
--- a/home/load_font.asm
+++ b/home/load_font.asm
@@ -1,6 +1,6 @@
 LoadFontTilePatterns::
 	ldh a, [rLCDC]
-	bit rLCDC_ENABLE, a
+	bit B_LCDC_ENABLE, a
 	jr nz, .on
 .off
 	ld hl, FontGraphics
@@ -16,7 +16,7 @@ LoadFontTilePatterns::
 
 LoadTextBoxTilePatterns::
 	ldh a, [rLCDC]
-	bit rLCDC_ENABLE, a
+	bit B_LCDC_ENABLE, a
 	jr nz, .on
 .off
 	ld hl, TextBoxGraphics
@@ -32,7 +32,7 @@ LoadTextBoxTilePatterns::
 
 LoadHpBarAndStatusTilePatterns::
 	ldh a, [rLCDC]
-	bit rLCDC_ENABLE, a
+	bit B_LCDC_ENABLE, a
 	jr nz, .on
 .off
 	ld hl, HpBarAndStatusGraphics
diff --git a/home/names.asm b/home/names.asm
index 7330a065..5848cb19 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -4,7 +4,7 @@ GetMonName::
 	push af
 	ld a, BANK(MonsterNames)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld a, [wNamedObjectIndex]
 	dec a
 	ld hl, MonsterNames
@@ -20,7 +20,7 @@ GetMonName::
 	pop de
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	pop hl
 	ret
 
diff --git a/home/names2.asm b/home/names2.asm
index 3bb6980c..7178e706 100644
--- a/home/names2.asm
+++ b/home/names2.asm
@@ -48,7 +48,7 @@ GetName::
 	; 2-7 = other names
 	ld a, [wPredefBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld a, [wNameListType]
 	dec a
 	add a
@@ -96,5 +96,5 @@ GetName::
 	pop hl
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
diff --git a/home/npc_movement.asm b/home/npc_movement.asm
index 96804fdf..ccbd78df 100644
--- a/home/npc_movement.asm
+++ b/home/npc_movement.asm
@@ -32,12 +32,12 @@ RunNPCMovementScript::
 	push af
 	ld a, [wNPCMovementScriptBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld a, [wNPCMovementScriptFunctionNum]
 	call CallFunctionInTable
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 .NPCMovementScriptPointerTables
@@ -58,9 +58,9 @@ IF DEF(_DEBUG)
 	bit BIT_DEBUG_MODE, a
 	ret z
 	ldh a, [hJoyHeld]
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	ret nz
 	ldh a, [hJoyPressed]
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 ENDC
 	ret
diff --git a/home/overworld.asm b/home/overworld.asm
index 9ca60c48..daa806d6 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -5,7 +5,7 @@ HandleMidJump::
 
 EnterMap::
 ; Load a new map.
-	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_A | PAD_B | PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
 	ld [wJoyIgnore], a
 	call LoadMapData
 	farcall ClearVariablesOnEnterMap
@@ -72,14 +72,14 @@ OverworldLoopLessDelay::
 .notSimulating
 	ldh a, [hJoyPressed]
 .checkIfStartIsPressed
-	bit BIT_START, a
+	bit B_PAD_START, a
 	jr z, .startButtonNotPressed
 ; if START is pressed
 	xor a ; TEXT_START_MENU
 	ldh [hTextID], a
 	jp .displayDialogue
 .startButtonNotPressed
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jp z, .checkIfDownButtonIsPressed
 ; if A is pressed
 	ld a, [wStatusFlags5]
@@ -146,7 +146,7 @@ OverworldLoopLessDelay::
 
 .checkIfDownButtonIsPressed
 	ldh a, [hJoyHeld] ; current joypad state
-	bit BIT_D_DOWN, a
+	bit B_PAD_DOWN, a
 	jr z, .checkIfUpButtonIsPressed
 	ld a, 1
 	ld [wSpritePlayerStateData1YStepVector], a
@@ -154,7 +154,7 @@ OverworldLoopLessDelay::
 	jr .handleDirectionButtonPress
 
 .checkIfUpButtonIsPressed
-	bit BIT_D_UP, a
+	bit B_PAD_UP, a
 	jr z, .checkIfLeftButtonIsPressed
 	ld a, -1
 	ld [wSpritePlayerStateData1YStepVector], a
@@ -162,7 +162,7 @@ OverworldLoopLessDelay::
 	jr .handleDirectionButtonPress
 
 .checkIfLeftButtonIsPressed
-	bit BIT_D_LEFT, a
+	bit B_PAD_LEFT, a
 	jr z, .checkIfRightButtonIsPressed
 	ld a, -1
 	ld [wSpritePlayerStateData1XStepVector], a
@@ -170,7 +170,7 @@ OverworldLoopLessDelay::
 	jr .handleDirectionButtonPress
 
 .checkIfRightButtonIsPressed
-	bit BIT_D_RIGHT, a
+	bit B_PAD_RIGHT, a
 	jr z, .noDirectionButtonsPressed
 	ld a, 1
 	ld [wSpritePlayerStateData1XStepVector], a
@@ -382,7 +382,7 @@ DoBikeSpeedup::
 	cp ROUTE_17 ; Cycling Road
 	jr nz, .goFaster
 	ldh a, [hJoyHeld]
-	and D_UP | D_LEFT | D_RIGHT
+	and PAD_UP | PAD_LEFT | PAD_RIGHT
 	ret nz
 .goFaster
 	jp AdvancePlayerSprite
@@ -432,7 +432,7 @@ CheckWarpsNoCollisionLoop::
 	pop bc
 	pop de
 	ldh a, [hJoyHeld]
-	and D_DOWN | D_UP | D_LEFT | D_RIGHT
+	and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT
 	jr z, CheckWarpsNoCollisionRetry2 ; if directional buttons aren't being pressed, do not pass through the warp
 	jr WarpFound1
 
@@ -763,7 +763,7 @@ HandleBlackOut::
 	res BIT_BATTLE_OVER_OR_BLACKOUT, [hl]
 	ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(PrepareForSpecialWarp) and BANK(SpecialEnterMap)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call ResetStatusAndHalveMoneyOnBlackout
 	call PrepareForSpecialWarp
 	call PlayDefaultMusicFadeOutCurrent
@@ -794,7 +794,7 @@ HandleFlyWarpOrDungeonWarp::
 	call LeaveMapAnim
 	ld a, BANK(PrepareForSpecialWarp)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call PrepareForSpecialWarp
 	jp SpecialEnterMap
 
@@ -1352,7 +1352,7 @@ LoadCurrentMapView::
 	push af
 	ld a, [wTilesetBank] ; tile data ROM bank
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a ; switch to ROM bank that contains tile data
+	ld [rROMB], a ; switch to ROM bank that contains tile data
 	ld a, [wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view
 	ld e, a
 	ld a, [wCurrentTileBlockMapViewPointer + 1]
@@ -1434,7 +1434,7 @@ LoadCurrentMapView::
 	jr nz, .rowLoop2
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a ; restore previous ROM bank
+	ld [rROMB], a ; restore previous ROM bank
 	ret
 
 AdvancePlayerSprite::
@@ -1828,9 +1828,9 @@ JoypadOverworld::
 	cp ROUTE_17 ; Cycling Road
 	jr nz, .notForcedDownwards
 	ldh a, [hJoyHeld]
-	and D_DOWN | D_UP | D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON
+	and PAD_DOWN | PAD_UP | PAD_LEFT | PAD_RIGHT | PAD_B | PAD_A
 	jr nz, .notForcedDownwards
-	ld a, D_DOWN
+	ld a, PAD_DOWN
 	ldh [hJoyHeld], a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
 .notForcedDownwards
 	ld a, [wStatusFlags5]
@@ -2266,7 +2266,7 @@ LoadMapHeader::
 	push af
 	ld a, BANK(MapSongBanks)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld hl, MapSongBanks
 	add hl, bc
 	add hl, bc
@@ -2276,7 +2276,7 @@ LoadMapHeader::
 	ld [wMapMusicROMBank], a ; music 2
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; function to copy map connection data from ROM to WRAM
@@ -2324,7 +2324,7 @@ LoadMapData::
 	inc e
 	dec c
 	jr nz, .vramCopyInnerLoop
-	ld a, BG_MAP_WIDTH - SCREEN_WIDTH
+	ld a, TILEMAP_WIDTH - SCREEN_WIDTH
 	add e
 	ld e, a
 	jr nc, .noCarry
@@ -2349,7 +2349,7 @@ LoadMapData::
 .restoreRomBank
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; function to switch to the ROM bank that a map is stored in
@@ -2368,7 +2368,7 @@ SwitchToMapRomBank::
 	call BankswitchBack
 	ldh a, [hMapROMBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	pop bc
 	pop hl
 	ret
@@ -2403,14 +2403,14 @@ CheckForUserInterruption::
 	pop bc
 
 	ldh a, [hJoyHeld]
-	cp D_UP + SELECT + B_BUTTON
+	cp PAD_UP + PAD_SELECT + PAD_B
 	jr z, .input
 
 	ldh a, [hJoy5]
 IF DEF(_DEBUG)
-	and START | SELECT | A_BUTTON
+	and PAD_START | PAD_SELECT | PAD_A
 ELSE
-	and START | A_BUTTON
+	and PAD_START | PAD_A
 ENDC
 	jr nz, .input
 
@@ -2433,7 +2433,7 @@ LoadDestinationWarpPosition::
 	push af
 	ld a, [wPredefParentBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld a, b
 	add a
 	add a
@@ -2445,5 +2445,5 @@ LoadDestinationWarpPosition::
 	call CopyData
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
diff --git a/home/pics.asm b/home/pics.asm
index 73ee35d7..ea34e3d5 100644
--- a/home/pics.asm
+++ b/home/pics.asm
@@ -93,7 +93,7 @@ LoadUncompressedSpriteData::
 	add a     ; 8*(7*((8-w)/2) + 7-h) ; combined overall offset (in bytes)
 	ldh [hSpriteOffset], a
 	xor a
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	ld hl, sSpriteBuffer0
 	call ZeroSpriteBuffer   ; zero buffer 0
 	ld de, sSpriteBuffer1
@@ -151,7 +151,7 @@ ZeroSpriteBuffer::
 ; de: output address
 InterlaceMergeSpriteBuffers::
 	xor a
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	push de
 	ld hl, sSpriteBuffer2 + (SPRITEBUFFERSIZE - 1) ; destination: end of buffer 2
 	ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1
diff --git a/home/pokemon.asm b/home/pokemon.asm
index afa0d129..3b990848 100644
--- a/home/pokemon.asm
+++ b/home/pokemon.asm
@@ -130,7 +130,7 @@ LoadFrontSpriteByMonIndex::
 	push af
 	ld a, BANK(CopyUncompressedPicToHL)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	xor a
 	ldh [hStartTileID], a
 	call CopyUncompressedPicToHL
@@ -138,7 +138,7 @@ LoadFrontSpriteByMonIndex::
 	ld [wSpriteFlipped], a
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 
@@ -226,11 +226,11 @@ PartyMenuInit::
 	ld [hli], a ; max menu item ID
 	ld a, [wForcePlayerToChooseMon]
 	and a
-	ld a, A_BUTTON | B_BUTTON
+	ld a, PAD_A | PAD_B
 	jr z, .next
 	xor a
 	ld [wForcePlayerToChooseMon], a
-	inc a ; a = A_BUTTON
+	inc a ; a = PAD_A
 .next
 	ld [hli], a ; menu watched keys
 	pop af
@@ -256,7 +256,7 @@ HandlePartyMenuInput::
 	jp nz, .swappingPokemon
 	pop af
 	ldh [hTileAnimations], a
-	bit BIT_B_BUTTON, b
+	bit B_PAD_B, b
 	jr nz, .noPokemonChosen
 	ld a, [wPartyCount]
 	and a
@@ -278,7 +278,7 @@ HandlePartyMenuInput::
 	scf
 	ret
 .swappingPokemon
-	bit BIT_B_BUTTON, b
+	bit B_PAD_B, b
 	jr z, .handleSwap ; if not, handle swapping the pokemon
 .cancelSwap ; if the B button was pressed
 	farcall ErasePartyMenuCursors
@@ -381,7 +381,7 @@ GetMonHeader::
 	push af
 	ld a, BANK(BaseStats)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	push bc
 	push de
 	push hl
@@ -436,7 +436,7 @@ GetMonHeader::
 	pop bc
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; copy party pokemon's name to wNameBuffer
diff --git a/home/predef.asm b/home/predef.asm
index 14ac07b5..b460105a 100644
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -14,13 +14,13 @@ Predef::
 	push af
 	ld a, BANK(GetPredefPointer)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	call GetPredefPointer
 
 	ld a, [wPredefBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	ld de, .done
 	push de
@@ -29,7 +29,7 @@ Predef::
 
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 GetPredefRegisters::
diff --git a/home/print_text.asm b/home/print_text.asm
index 65d418a3..fe784350 100644
--- a/home/print_text.asm
+++ b/home/print_text.asm
@@ -25,11 +25,11 @@ PrintLetterDelay::
 	call Joypad
 	ldh a, [hJoyHeld]
 .checkAButton
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jr z, .checkBButton
 	jr .endWait
 .checkBButton
-	bit BIT_B_BUTTON, a
+	bit B_PAD_B, a
 	jr z, .buttonsNotPressed
 .endWait
 	call DelayFrame
diff --git a/home/reload_tiles.asm b/home/reload_tiles.asm
index 76110dbe..06aeb1eb 100644
--- a/home/reload_tiles.asm
+++ b/home/reload_tiles.asm
@@ -11,7 +11,7 @@ ReloadMapData::
 	call EnableLCD
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; reloads tileset tile patterns
@@ -25,7 +25,7 @@ ReloadTilesetTilePatterns::
 	call EnableLCD
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; shows the town map and lets the player choose a destination to fly to
diff --git a/home/serial.asm b/home/serial.asm
index bfec707b..631ec70c 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -14,7 +14,7 @@ Serial::
 	cp USING_INTERNAL_CLOCK
 	jr z, .done
 ; using external clock
-	ld a, START_TRANSFER_EXTERNAL_CLOCK
+	ld a, SC_START | SC_EXTERNAL
 	ldh [rSC], a
 	jr .done
 .connectionNotYetEstablished
@@ -32,7 +32,7 @@ Serial::
 	ldh a, [rDIV]
 	bit 7, a ; wait until rDIV has incremented from $3 to $80 or more
 	jr nz, .waitLoop
-	ld a, START_TRANSFER_EXTERNAL_CLOCK
+	ld a, SC_START | SC_EXTERNAL
 	ldh [rSC], a
 	jr .done
 .usingInternalClock
@@ -92,7 +92,7 @@ Serial_ExchangeByte::
 	ldh a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
 	jr nz, .loop
-	ld a, START_TRANSFER_INTERNAL_CLOCK
+	ld a, SC_START | SC_INTERNAL
 	ldh [rSC], a
 .loop
 	ldh a, [hSerialReceivedNewData]
@@ -117,8 +117,8 @@ Serial_ExchangeByte::
 	jp SetUnknownCounterToFFFF
 .doNotIncrementUnknownCounter
 	ldh a, [rIE]
-	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
-	cp 1 << SERIAL
+	and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK
+	cp IE_SERIAL
 	jr nz, .loop
 	ld a, [wUnknownSerialCounter2]
 	dec a
@@ -139,8 +139,8 @@ Serial_ExchangeByte::
 	xor a
 	ldh [hSerialReceivedNewData], a
 	ldh a, [rIE]
-	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
-	sub 1 << SERIAL
+	and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK
+	sub IE_SERIAL
 	jr nz, .skipReloadingUnknownCounter2
 	ld [wUnknownSerialCounter2], a
 	ld a, $50
@@ -165,8 +165,8 @@ Serial_ExchangeByte::
 	jr z, SetUnknownCounterToFFFF
 .done
 	ldh a, [rIE]
-	and (1 << SERIAL) | (1 << TIMER) | (1 << LCD_STAT) | (1 << VBLANK)
-	cp 1 << SERIAL
+	and IE_SERIAL | IE_TIMER | IE_STAT | IE_VBLANK
+	cp IE_SERIAL
 	ld a, SERIAL_NO_DATA_BYTE
 	ret z
 	ld a, [hl]
@@ -291,7 +291,7 @@ Serial_ExchangeNybble::
 	ldh a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
 	jr nz, .doExchange
-	ld a, START_TRANSFER_INTERNAL_CLOCK
+	ld a, SC_START | SC_INTERNAL
 	ldh [rSC], a
 .doExchange
 	ldh a, [hSerialReceiveData]
@@ -312,7 +312,7 @@ Serial_SendZeroByte::
 	ldh a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
 	ret nz
-	ld a, START_TRANSFER_INTERNAL_CLOCK
+	ld a, SC_START | SC_INTERNAL
 	ldh [rSC], a
 	ret
 
@@ -321,6 +321,6 @@ Serial_TryEstablishingExternallyClockedConnection::
 	ldh [rSB], a
 	xor a
 	ldh [hSerialReceiveData], a
-	ld a, START_TRANSFER_EXTERNAL_CLOCK
+	ld a, SC_START | SC_EXTERNAL
 	ldh [rSC], a
 	ret
diff --git a/home/start.asm b/home/start.asm
index 5e301da2..79caca09 100644
--- a/home/start.asm
+++ b/home/start.asm
@@ -1,5 +1,5 @@
 _Start::
-	cp CGB
+	cp BOOTUP_A_CGB
 	jr z, .cgb
 	xor a
 	jr .ok
diff --git a/home/start_menu.asm b/home/start_menu.asm
index 5a531744..6de15182 100644
--- a/home/start_menu.asm
+++ b/home/start_menu.asm
@@ -1,7 +1,7 @@
 DisplayStartMenu::
 	ld a, BANK(StartMenu_Pokedex)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ld a, [wWalkBikeSurfState] ; walking/biking/surfing
 	ld [wWalkBikeSurfStateCopy], a
 	ld a, SFX_START_MENU
@@ -15,7 +15,7 @@ RedisplayStartMenu::
 	call HandleMenuInput
 	ld b, a
 .checkIfUpPressed
-	bit BIT_D_UP, a
+	bit B_PAD_UP, a
 	jr z, .checkIfDownPressed
 	ld a, [wCurrentMenuItem] ; menu selection
 	and a
@@ -33,7 +33,7 @@ RedisplayStartMenu::
 	call EraseMenuCursor
 	jr .loop
 .checkIfDownPressed
-	bit BIT_D_DOWN, a
+	bit B_PAD_DOWN, a
 	jr z, .buttonPressed
 ; if the player pressed tried to go past the bottom item, wrap around to the top
 	CheckEvent EVENT_GOT_POKEDEX
@@ -54,7 +54,7 @@ RedisplayStartMenu::
 	ld a, [wCurrentMenuItem]
 	ld [wBattleAndStartSavedMenuItem], a ; save current menu selection
 	ld a, b
-	and B_BUTTON | START ; was the Start button or B button pressed?
+	and PAD_B | PAD_START ; was the Start button or B button pressed?
 	jp nz, CloseStartMenu
 	call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2
 	CheckEvent EVENT_GOT_POKEDEX
@@ -79,7 +79,7 @@ RedisplayStartMenu::
 CloseStartMenu::
 	call Joypad
 	ldh a, [hJoyPressed]
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jr nz, CloseStartMenu
 	call LoadTextBoxTilePatterns
 	jp CloseTextDisplay
diff --git a/home/text.asm b/home/text.asm
index df5cfe51..17fb7266 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -494,7 +494,7 @@ TextCommand_PAUSE::
 	push bc
 	call Joypad
 	ldh a, [hJoyHeld]
-	and A_BUTTON | B_BUTTON
+	and PAD_A | PAD_B
 	jr nz, .done
 	ld c, 30 ; half a second
 	call DelayFrames
@@ -570,7 +570,7 @@ TextCommand_DOTS::
 	call Joypad
 	pop de
 	ldh a, [hJoyHeld] ; joypad state
-	and A_BUTTON | B_BUTTON
+	and PAD_A | PAD_B
 	jr nz, .next ; if so, skip the delay
 	ld c, 10
 	call DelayFrames
@@ -604,7 +604,7 @@ TextCommand_FAR::
 	ld a, [hli]
 
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	push hl
 	ld l, e
@@ -614,7 +614,7 @@ TextCommand_FAR::
 
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	jp NextTextCommand
 
 TextCommandJumpTable::
diff --git a/home/text_script.asm b/home/text_script.asm
index f3015b66..35dd955b 100644
--- a/home/text_script.asm
+++ b/home/text_script.asm
@@ -99,7 +99,7 @@ AfterDisplayingTextID::
 HoldTextDisplayOpen::
 	call Joypad
 	ldh a, [hJoyHeld]
-	bit BIT_A_BUTTON, a
+	bit B_PAD_A, a
 	jr nz, HoldTextDisplayOpen
 
 CloseTextDisplay::
@@ -125,7 +125,7 @@ CloseTextDisplay::
 	jr nz, .restoreSpriteFacingDirectionLoop
 	ld a, BANK(InitMapSprites)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns)
 	ld hl, wFontLoaded
 	res BIT_FONT_LOADED, [hl]
@@ -135,7 +135,7 @@ CloseTextDisplay::
 	call LoadCurrentMapView
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	jp UpdateSprites
 
 DisplayPokemartDialogue::
diff --git a/home/trainers.asm b/home/trainers.asm
index 04752cc2..835121e1 100644
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -149,7 +149,7 @@ ENDC
 	xor a ; EXCLAMATION_BUBBLE
 	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
-	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
+	ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN
 	ld [wJoyIgnore], a
 	xor a
 	ldh [hJoyHeld], a
@@ -349,7 +349,7 @@ PrintEndBattleText::
 	push af
 	ld a, [wEndBattleTextRomBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	push hl
 	farcall SaveTrainerName
 	ld hl, TrainerEndBattleText
@@ -357,7 +357,7 @@ PrintEndBattleText::
 	pop hl
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	farcall SetEnemyTrainerToStayAndFaceAnyDirection
 	jp WaitForSoundToFinish
 
diff --git a/home/uncompress.asm b/home/uncompress.asm
index b6cb1e8d..731ae642 100644
--- a/home/uncompress.asm
+++ b/home/uncompress.asm
@@ -11,15 +11,15 @@ UncompressSpriteData::
 	push af
 	ld a, b
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
-	ld a, SRAM_ENABLE
-	ld [MBC1SRamEnable], a
+	ld [rROMB], a
+	ld a, RAMG_SRAM_ENABLE
+	ld [rRAMG], a
 	xor a
-	ld [MBC1SRamBank], a
+	ld [rRAMB], a
 	call _UncompressSpriteData
 	pop af
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	ret
 
 ; initializes necessary data to load a sprite and runs UncompressSpriteDataLoop
diff --git a/home/vblank.asm b/home/vblank.asm
index b8b46ba7..fc5d266b 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -29,7 +29,7 @@ VBlank::
 	call hDMARoutine
 	ld a, BANK(PrepareOAMData)
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 	call PrepareOAMData
 
 	; VBlank-sensitive operations end.
@@ -54,7 +54,7 @@ VBlank::
 
 	ld a, [wAudioROMBank] ; music ROM bank
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	cp BANK(Audio1_UpdateMusic)
 	jr nz, .checkForAudio2
@@ -80,7 +80,7 @@ VBlank::
 
 	ld a, [wVBlankSavedROMBank]
 	ldh [hLoadedROMBank], a
-	ld [MBC1RomBank], a
+	ld [rROMB], a
 
 	pop hl
 	pop de
diff --git a/home/vcopy.asm b/home/vcopy.asm
index 1b742817..6a9d9b7f 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -23,7 +23,7 @@ ClearBgMap::
 	jr .next
 	ld a, l
 .next
-	ld de, BG_MAP_WIDTH * BG_MAP_HEIGHT
+	ld de, TILEMAP_WIDTH * TILEMAP_HEIGHT
 	ld l, e
 .loop
 	ld [hli], a
@@ -61,7 +61,7 @@ RedrawRowOrColumn::
 	inc de
 	ld a, [hli]
 	ld [de], a
-	ld a, BG_MAP_WIDTH - 1
+	ld a, TILEMAP_WIDTH - 1
 	add e
 	ld e, a
 	jr nc, .noCarry
@@ -86,7 +86,7 @@ RedrawRowOrColumn::
 	push de
 	call .DrawHalf ; draw upper half
 	pop de
-	ld a, BG_MAP_WIDTH ; width of VRAM background map
+	ld a, TILEMAP_WIDTH ; width of VRAM background map
 	add e
 	ld e, a
 	; fall through and draw lower half
@@ -181,7 +181,7 @@ ENDR
 	inc l
 	ld [hl], d
 
-	ld a, BG_MAP_WIDTH - (SCREEN_WIDTH - 1)
+	ld a, TILEMAP_WIDTH - (SCREEN_WIDTH - 1)
 	add l
 	ld l, a
 	jr nc, .ok
@@ -259,7 +259,7 @@ VBlankCopyDouble::
 	ldh [hVBlankCopyDoubleSize], a
 
 .loop
-REPT LEN_2BPP_TILE / 4 - 1
+REPT TILE_SIZE / 4 - 1
 	pop de
 	ld [hl], e
 	inc l
@@ -336,7 +336,7 @@ VBlankCopy::
 	ldh [hVBlankCopySize], a
 
 .loop
-REPT LEN_2BPP_TILE / 2 - 1
+REPT TILE_SIZE / 2 - 1
 	pop de
 	ld [hl], e
 	inc l
diff --git a/home/window.asm b/home/window.asm
index 48ab1d0e..48bef77a 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -50,7 +50,7 @@ HandleMenuInput_::
 	ld [wCheckFor180DegreeTurn], a
 	ldh a, [hJoy5]
 	ld b, a
-	bit BIT_D_UP, a
+	bit B_PAD_UP, a
 	jr z, .checkIfDownPressed
 .upPressed
 	ld a, [wCurrentMenuItem] ; selected menu item
@@ -68,7 +68,7 @@ HandleMenuInput_::
 	ld [wCurrentMenuItem], a ; wrap to the bottom of the menu
 	jr .checkOtherKeys
 .checkIfDownPressed
-	bit BIT_D_DOWN, a
+	bit B_PAD_DOWN, a
 	jr z, .checkOtherKeys
 .downPressed
 	ld a, [wCurrentMenuItem]
@@ -91,7 +91,7 @@ HandleMenuInput_::
 	jp z, .loop1
 .checkIfAButtonOrBButtonPressed
 	ldh a, [hJoy5]
-	and A_BUTTON | B_BUTTON
+	and PAD_A | PAD_B
 	jr z, .skipPlayingSound
 .AButtonOrBButtonPressed
 	push hl