From 7ba3f53d423f61c701226185039859626e65426d Mon Sep 17 00:00:00 2001 From: Ninjdai <65647523+Ninjdai1@users.noreply.github.com> Date: Sun, 21 Jan 2024 22:25:43 +0100 Subject: [PATCH] Add ITEMS_COUNT and ITEM_NAME_LENGTH to RHH rom header (#3988) * Add item count to RHH rom header There was no way for an external program to access the ITEMS_COUNT. * Add items.h include * Add itemNameLength to RHH rom header * Added padding for additional u8s Co-authored-by: Eduardo Quezada D'Ottone * Change itemsCount to a u16 * Fix padding (again) * Update src/rom_header_rhh.c Co-authored-by: Eduardo Quezada D'Ottone --------- Co-authored-by: Eduardo Quezada D'Ottone Co-authored-by: Bassoonian --- src/rom_header_rhh.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rom_header_rhh.c b/src/rom_header_rhh.c index 13e9856b70..5026dcdcc3 100644 --- a/src/rom_header_rhh.c +++ b/src/rom_header_rhh.c @@ -3,6 +3,7 @@ #include "constants/expansion.h" #include "constants/moves.h" #include "constants/species.h" +#include "constants/items.h" // Similar to the GF ROM header, this struct allows external programs to // detect details about Expansion. @@ -21,6 +22,9 @@ struct RHHRomHeader /*0x0C*/ u16 numSpecies; /*0x0E*/ u16 abilitiesCount; /*0x10*/ const struct Ability *abilities; + /*0x14*/ u16 itemsCount; + /*0x16*/ u8 itemNameLength; + /*0x17*/ u8 padding; }; __attribute__((section(".text.consts"))) @@ -35,4 +39,6 @@ static const struct RHHRomHeader sRHHRomHeader = .numSpecies = NUM_SPECIES, .abilitiesCount = ABILITIES_COUNT, .abilities = gAbilities, + .itemsCount = ITEMS_COUNT, + .itemNameLength = ITEM_NAME_LENGTH, };