From 7cac5b787bda37b5ed1fc5ea39e6a96c046cca9d Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sat, 6 Aug 2022 12:24:40 -0400
Subject: [PATCH] Assert that there are NUM_FRAMES textbox frames

---
 engine/menus/options_menu.asm | 18 +++++++++---------
 gfx/font.asm                  |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm
index edaba2359..08c2e69a7 100644
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -1,14 +1,14 @@
 ; GetOptionPointer.Pointers indexes
 	const_def
-	const OPT_TEXT_SPEED   ; 0
-	const OPT_BATTLE_SCENE ; 1
-	const OPT_BATTLE_STYLE ; 2
-	const OPT_SOUND        ; 3
-	const OPT_PRINT        ; 4
-	const OPT_MENU_ACCOUNT ; 5
-	const OPT_FRAME        ; 6
-	const OPT_CANCEL       ; 7
-DEF NUM_OPTIONS EQU const_value    ; 8
+	const OPT_TEXT_SPEED    ; 0
+	const OPT_BATTLE_SCENE  ; 1
+	const OPT_BATTLE_STYLE  ; 2
+	const OPT_SOUND         ; 3
+	const OPT_PRINT         ; 4
+	const OPT_MENU_ACCOUNT  ; 5
+	const OPT_FRAME         ; 6
+	const OPT_CANCEL        ; 7
+DEF NUM_OPTIONS EQU const_value ; 8
 
 _Option:
 	ld hl, hInMenu
diff --git a/gfx/font.asm b/gfx/font.asm
index 3dcd8075b..465920b3e 100644
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -8,6 +8,7 @@ FontBattleExtra:
 INCBIN "gfx/font/font_battle_extra.2bpp"
 
 Frames:
+	table_width TEXTBOX_FRAME_TILES * LEN_1BPP_TILE, Frames
 INCBIN "gfx/frames/1.1bpp"
 INCBIN "gfx/frames/2.1bpp"
 INCBIN "gfx/frames/3.1bpp"
@@ -16,7 +17,8 @@ INCBIN "gfx/frames/5.1bpp"
 INCBIN "gfx/frames/6.1bpp"
 INCBIN "gfx/frames/7.1bpp"
 INCBIN "gfx/frames/8.1bpp"
-INCBIN "gfx/frames/9.1bpp"
+	assert_table_length NUM_FRAMES
+INCBIN "gfx/frames/9.1bpp" ; unused
 
 StatsScreenPageTilesGFX:
 INCBIN "gfx/stats/stats_tiles.2bpp"