diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-08-13 15:09:12 -0400 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-08-13 15:09:12 -0400 |
| commit | c51d1b7a1d03934f73ab1d8d6463581f671bf0a1 (patch) | |
| tree | 711572090a761045918297d6f20091a87414f85d | |
| parent | Say how many bytes the assertion macros expected vs got (diff) | |
| download | pokeyellow-c51d1b7a1d03934f73ab1d8d6463581f671bf0a1.tar.gz pokeyellow-c51d1b7a1d03934f73ab1d8d6463581f671bf0a1.tar.xz pokeyellow-c51d1b7a1d03934f73ab1d8d6463581f671bf0a1.zip | |
List end markers (-1 aka $FF) are not part of table data
| -rw-r--r-- | data/maps/hide_show_data.asm | 6 | ||||
| -rw-r--r-- | scripts/CeruleanBadgeHouse.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 08d21511..bc68c90f 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -255,7 +255,7 @@ MapHSPointers: dw -1 ; end NoHS: - db $FF, $FF, $FF + db -1, -1, -1 ; end MissableObjects: ; entries correspond to HS_* constants (see constants/hide_show_constants) @@ -564,5 +564,5 @@ SeafoamIslandsB4FHS: db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_BOULDER1, HIDE db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_BOULDER2, HIDE db SEAFOAM_ISLANDS_B4F, SEAFOAMISLANDSB4F_ARTICUNO, SHOW - db $FF, $01, SHOW ; end - assert_table_length NUM_HS_OBJECTS + 1 + assert_table_length NUM_HS_OBJECTS + db -1, 1, SHOW ; end diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 1c7e0200..65606a5e 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -53,8 +53,8 @@ CeruleanBadgeHouseMiddleAgedManText: jp TextScriptEnd .BadgeItemList: - table_width 1 db NUM_BADGES ; # + table_width 1 db BOULDERBADGE db CASCADEBADGE db THUNDERBADGE @@ -63,8 +63,8 @@ CeruleanBadgeHouseMiddleAgedManText: db MARSHBADGE db VOLCANOBADGE db EARTHBADGE + assert_table_length NUM_BADGES db -1 ; end - assert_table_length NUM_BADGES + 2 .Text: text_far _CeruleanBadgeHouseMiddleAgedManText |