Follow up to rh-hideout#4579: wrong naming

AlexOn1ine · May 18, 2024 · e1e267f · e1e267f
1 parent 4b221b5
commit e1e267f
Show file tree

Hide file tree

Showing 6 changed files with 735 additions and 735 deletions.
diff --git a/include/item.h b/include/item.h
@@ -23,7 +23,7 @@ struct Item
     u8 type;
     u8 battleUsage;
     u8 flingPower;
-    const u32 *iconSprite;
+    const u32 *iconPic;
     const u32 *iconPalette;
 };
 

diff --git a/include/item_icon.h b/include/item_icon.h
@@ -11,7 +11,7 @@ void FreeItemIconTemporaryBuffers(void);
 void CopyItemIconPicTo4x4Buffer(const void *src, void *dest);
 u8 AddItemIconSprite(u16 tilesTag, u16 paletteTag, u16 itemId);
 u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u16 tilesTag, u16 paletteTag, u16 itemId);
-const void *GetItemIconSprite(u16 itemId);
+const void *GetItemIconPic(u16 itemId);
 const void *GetItemIconPalette(u16 itemId);
 
 #endif //GUARD_ITEM_ICON_H
diff --git a/migration_scripts/convert_item_icons.py b/migration_scripts/convert_item_icons.py
@@ -16,8 +16,8 @@
 icon_table_data = {}
 for match in icon_table_pattern.findall(icon_table_content):
     if len(match) == 3:
-        item_name, icon_sprite, icon_palette = match
-        icon_table_data[item_name] = (icon_sprite, icon_palette)
+        item_name, icon_pic, icon_palette = match
+        icon_table_data[item_name] = (icon_pic, icon_palette)
 
 # Read items.h content
 for file in glob.glob('./src/data/items.h'):
@@ -29,9 +29,9 @@ def add_icon_data(match):
     item_name = match.group(1)
     item_content = match.group(2)
     if item_name in icon_table_data:
-        icon_sprite, icon_palette = icon_table_data[item_name]
-        print(f"Updating {item_name}: adding iconSprite = {icon_sprite}, iconPalette = {icon_palette}")
-        return f'[{item_name}] =\n    {{{item_content}    .iconSprite = {icon_sprite},\n        .iconPalette = {icon_palette},\n    }},'
+        icon_pic, icon_palette = icon_table_data[item_name]
+        print(f"Updating {item_name}: adding iconPic = {icon_pic}, iconPalette = {icon_palette}")
+        return f'[{item_name}] =\n    {{{item_content}    .iconPic = {icon_pic},\n        .iconPalette = {icon_palette},\n    }},'
     else:
         return match.group(0)
 
@@ -42,4 +42,4 @@ def add_icon_data(match):
 for file in glob.glob('./src/data/items.h'):
     with open(file, 'w') as f:
         f.write(modified_items_content)
-        print("items.h has been updated")
+        print("items.h has been updated")