diff --git a/charmap.asm b/charmap.asm
index 1c3156abb..e7d99e763 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -181,7 +181,9 @@ pushc
 	charmap "\r", $0d
 popc
 
-; Significant tile equivalences
+; Background tile equivalences (vTiles1)
 DEF OVERWORLD_FRAME_FIRST_TILE EQU "┌"
 DEF BOARD_MENU_BG_FIRST_TILE EQU "A"
-DEF BOARD_MENU_OAM_FIRST_TILE EQU BOARD_MENU_BG_FIRST_TILE + 18 * 3
+
+; Object tile locations (vTiles0)
+DEF BOARD_MENU_OAM_FIRST_TILE EQU $20
diff --git a/engine/gfx/load_board_gfx.asm b/engine/gfx/load_board_gfx.asm
index c932a53b3..b1ad90156 100755
--- a/engine/gfx/load_board_gfx.asm
+++ b/engine/gfx/load_board_gfx.asm
@@ -1,10 +1,10 @@
 LoadBoardMenuGFX::
 	ld de, .BoardMenuGFX
-	ld hl, vTiles1
+	ld hl, vTiles0 + BOARD_MENU_BG_FIRST_TILE * LEN_2BPP_TILE
 	lb bc, BANK(.BoardMenuGFX), 18 * 3
 	call Get2bppViaHDMA
 	ld de, .BoardMenuOAMGFX
-	ld hl, vTiles1 + (18 * 3) * LEN_2BPP_TILE
+	ld hl, vTiles0 + BOARD_MENU_OAM_FIRST_TILE * LEN_2BPP_TILE
 	lb bc, BANK(.BoardMenuOAMGFX), 3 * 3 * NUM_BOARD_MENU_ITEMS
 	call Get2bppViaHDMA
 	ret