ref: 187b120007f14b2b7f44bad5a33de6021ec07d1a
parent: d4a6a1b2bcf94915020f2a6c96b8004479185325
author: Rangi <[email protected]>
date: Sun Oct 24 14:25:44 EDT 2021
Add assertions to some more tables
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -125,6 +125,7 @@
const PREDEFPAL_UNOWN_PUZZLE
const PREDEFPAL_GAMEFREAK_LOGO_OB
const PREDEFPAL_GAMEFREAK_LOGO_BG
+NUM_PREDEF_PALS EQU const_value
; SGB system command codes
; http://gbdev.gg8.se/wiki/articles/SGB_Functions#SGB_System_Command_Table
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -1170,7 +1170,9 @@
INCLUDE "data/sgb_ctrl_packets.asm"
PredefPals:
+ table_width PALETTE_SIZE, PredefPals
INCLUDE "gfx/sgb/predef.pal"
+ assert_table_length NUM_PREDEF_PALS
SGBBorderMapAndPalettes:
; interleaved tile ids and palette ids, without the center 20x18 screen area
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -11,6 +11,7 @@
const BLUESKY_MAIL_INDEX ; 7
const MUSIC_MAIL_INDEX ; 8
const MIRAGE_MAIL_INDEX ; 9
+NUM_MAIL EQU const_value
ReadPartyMonMail:
ld a, [wCurPartyMon]
@@ -126,6 +127,7 @@
MailGFXPointers:
; entries correspond to *MAIL_INDEX constants
+ table_width 3, MailGFXPointers
dbw FLOWER_MAIL, LoadFlowerMailGFX
dbw SURF_MAIL, LoadSurfMailGFX
dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
@@ -136,6 +138,7 @@
dbw BLUESKY_MAIL, LoadBlueSkyMailGFX
dbw MUSIC_MAIL, LoadMusicMailGFX
dbw MIRAGE_MAIL, LoadMirageMailGFX
+ assert_table_length NUM_MAIL
db -1 ; end
LoadSurfMailGFX:
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -570,9 +570,11 @@
.Jumptable:
; entries correspond to *_PAGE constants
+ table_width 2, StatsScreen_LoadGFX.Jumptable
dw LoadPinkPage
dw LoadGreenPage
dw LoadBluePage
+ assert_table_length NUM_STAT_PAGES
LoadPinkPage:
hlcoord 0, 9
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -1,4 +1,4 @@
- RGB 31,31,31, 22,25,19, 16,21,30, 00,00,00 ; PREDEFPAL_00
+ RGB 31,31,31, 22,25,19, 16,21,30, 00,00,00 ; PREDEFPAL_ROUTES
RGB 31,31,31, 27,28,31, 15,20,31, 00,00,00 ; PREDEFPAL_PALLET
RGB 31,31,31, 24,28,19, 15,20,31, 00,00,00 ; PREDEFPAL_VIRIDIAN
RGB 31,31,31, 24,24,24, 15,20,31, 00,00,00 ; PREDEFPAL_PEWTER